Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add AC-4 format support #5303

Merged
merged 9 commits into from
Mar 26, 2019
Merged

Add AC-4 format support #5303

merged 9 commits into from
Mar 26, 2019

Conversation

ybai001
Copy link
Contributor

@ybai001 ybai001 commented Dec 24, 2018

  • Add AC-4 MIME type definition
  • Add AC-4 format support in Mp4Extractor and TsExtractor
  • Add AC-4 Extractor
  • Add AC-4 playback support in MPEG-4, MPEG-DASH, TS and HLS

@ybai001
Merge pull request #1 from google/dev-v2
7a924d6 
Pull from google:dev-v2
@ybai001
Merge pull request #2 from google/dev-v2
246d464 
Pull from google/ExoPlayer dev-v2
@ybai001
Add AC-4 format support
ae40208 
 * Add AC-4 MIME type definition
 * Add AC-4 format support in Mp4Extractor and TsExtractor
 * Add AC-4 Extractor
 * Add AC-4 playback support in MPEG-4, MPEG-DASH, TS and HLS
@ojw28 ojw28 requested a review from andrewlewis January 2, 2019 12:01
andrewlewis
andrewlewis reviewed Jan 21, 2019
View reviewed changes
Copy link
Collaborator

@andrewlewis andrewlewis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you have a sample .ac4 stream that could be used to add an Ac4ExtractorTest just like Ac3ExtractorTest?

This looks good to submit once that's added and the comments are addressed. Thanks!

...ary/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java Show resolved Hide resolved
library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java Show resolved Hide resolved
...y/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java Outdated Show resolved Hide resolved
library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Reader.java Outdated Show resolved Hide resolved
library/core/src/main/java/com/google/android/exoplayer2/audio/Ac4Util.java Outdated Show resolved Hide resolved
library/core/src/main/java/com/google/android/exoplayer2/audio/Ac4Util.java Show resolved Hide resolved
library/core/src/main/java/com/google/android/exoplayer2/audio/Ac4Util.java Show resolved Hide resolved
@ybai001
Copy link
Contributor Author

ybai001 commented Jan 23, 2019 •
edited
Loading

Do you have a sample .ac4 stream that could be used to add an Ac4ExtractorTest just like Ac3ExtractorTest?

I talked with content creation team. It should be OK to add a sample .ac4 file. After I get approval from legal team, I'll add it into this contribution.

@ybai001
Copy link
Contributor Author

ybai001 commented Jan 24, 2019

Do you have a sample .ac4 stream that could be used to add an Ac4ExtractorTest just like Ac3ExtractorTest?

This looks good to submit once that's added and the comments are addressed. Thanks!

Hi, Andrew,
I have asked content creation team to create sample.ac4 file. And I have one question: How to generate corresponding .dump file in folder library/core/src/test/assets/ts?

@andrewlewis
Copy link
Collaborator

andrewlewis commented Jan 24, 2019 •
edited
Loading

@ybai001 You can set the field FakeExtractorOutput.WRITE_DUMP to true temporarily, then copy the file that gets written to the sdcard into the assets directory.

@ybai001
Add AC-4 format support
460f576 
 * Add AC-4 MIME type definition
 * Add AC-4 format support in Mp4Extractor and TsExtractor
 * Add AC-4 Extractor
 * Add AC-4 playback support in MPEG-4, MPEG-DASH, TS and HLS
ybai001 and others added 2 commits January 25, 2019 16:32
@ybai001
Add AC-4 format support
e462c6a 
 * Add AC-4 MIME type definition
 * Add AC-4 format support in Mp4Extractor and TsExtractor
 * Add AC-4 Extractor
 * Add AC-4 playback support in MPEG-4, MPEG-DASH, TS and HLS
@ybai001
Update Ac4Reader.java
51632f0
andrewlewis
andrewlewis reviewed Jan 30, 2019
View reviewed changes
Copy link
Collaborator

@andrewlewis andrewlewis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks.

library/core/src/main/java/com/google/android/exoplayer2/audio/Ac4Util.java Outdated Show resolved Hide resolved
library/core/src/main/java/com/google/android/exoplayer2/audio/Ac4Util.java Show resolved Hide resolved
library/core/src/main/java/com/google/android/exoplayer2/audio/Ac4Util.java Show resolved Hide resolved
@ybai001
Merge branch 'dev-v2-ac4' of https://github.com/DolbyLaboratories/Exo…
3ea71f8 
…Player into dev-v2-ac4
@ybai001
Update code based on code review result
8f32c29 
 * remove field mimeType in Ac4Util.java
 * change constant CHANNEL_COUNT_2 to private in Ac4Util.java
@ybai001
Copy link
Contributor Author

ybai001 commented Jan 31, 2019

Sorry for the untidy commit history. I‘m not familiar with the working process on GitHub.
BTW, next week is Chinese new year. I'm afraid that I can't reply in time.

andrewlewis
andrewlewis reviewed Feb 1, 2019
View reviewed changes
Copy link
Collaborator

@andrewlewis andrewlewis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thanks! This pull request will automatically be marked as merged when we submit this internally and update the development branch.

library/core/src/main/java/com/google/android/exoplayer2/audio/Ac4Util.java Show resolved Hide resolved
@tonihei tonihei merged commit 55ed5cf into google:dev-v2 Mar 26, 2019
tonihei added a commit that referenced this pull request Mar 26, 2019
@tonihei
Merge pull request #5303 from DolbyLaboratories:dev-v2-ac4
5da4c67 
PiperOrigin-RevId: 239957730
@google google locked and limited conversation to collaborators Aug 5, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@andrewlewis andrewlewis andrewlewis left review comments

Assignees

@andrewlewis andrewlewis

Labels
cla: yes should merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ybai001 @andrewlewis @googlebot @tonihei