Dts mpeg2ts update #275

rahulnmohan · 2023-03-22T09:05:32Z

Added below mentioned features.

Support for extracting DTS LBR(DTS Express) and DTS UHD Profile 2(DTS:X) descriptor ID from PSI PMT
The DTSReader class is updated for extracting a DTS LBR frame.
Newly added DTSUhdReader class for extracting DTS UHD frame.
The DTSUtil class is updated to parse the DTS LBR or DTS UHD frame and report the format information.

Similar changes are done for the ExoPlayer.
Pull request for the ExoPlayer updates: google/ExoPlayer#11076
Feature request for the ExoPlayer: google/ExoPlayer#11075

rohitjoins · 2023-03-22T13:08:12Z

@rahulnmohan Do you think we can add some tests for this change?

rahulnmohan · 2023-03-23T05:17:07Z

@rahulnmohan Do you think we can add some tests for this change?

@rohitjoins I will check how to add test cases for the proposed changes.

rahulnmohan · 2023-03-24T14:40:38Z

@rohitjoins
Is there any documentation available for adding new tests to the framework?

I have added test entries for sampleWithDts* in TsExtractorTest class and copied sample files into libraries\test_data\src\test\assets\media\ts directory.
While running the test, seeing the below errors.

Dump file not found. To update the dump file, change DumpFileAsserts#DUMP_FILE_ACTION to WRITE_TO_LOCAL (for Robolectric tests) or WRITE_TO_DEVICE (for instrumentation tests) and re-run the test. java.io.IOException: Dump file not found. To update the dump file, change DumpFileAsserts#DUMP_FILE_ACTION to WRITE_TO_LOCAL (for Robolectric tests) or WRITE_TO_DEVICE (for instrumentation tests) and re-run the test. at androidx.media3.test.utils.DumpFileAsserts.assertOutput(DumpFileAsserts.java:163) at androidx.media3.test.utils.DumpFileAsserts.assertOutput(DumpFileAsserts.java:95) at androidx.media3.test.utils.ExtractorAsserts.assertOutput(ExtractorAsserts.java:454) at androidx.media3.test.utils.ExtractorAsserts.assertBehavior(ExtractorAsserts.java:398) at androidx.media3.test.utils.ExtractorAsserts.assertBehavior(ExtractorAsserts.java:354) at androidx.media3.extractor.ts.TsExtractorTest.sampleWithDts(TsExtractorTest.java:119) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.base/java.lang.reflect.Method.invoke(Method.java:566) at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:59) at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12) at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:56) at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17) at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306) at org.robolectric.RobolectricTestRunner$HelperTestRunner$1.evaluate(RobolectricTestRunner.java:591) at org.robolectric.internal.SandboxTestRunner$2.lambda$evaluate$0(SandboxTestRunner.java:274) at org.robolectric.internal.bytecode.Sandbox.lambda$runOnMainThread$0(Sandbox.java:88) at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264) at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128) at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628) at java.base/java.lang.Thread.run(Thread.java:829) Caused by: java.io.FileNotFoundException: extractordumps/ts/sample_dts.ts.0.dump at org.robolectric.shadows.ShadowArscAssetManager10.nativeOpenAsset(ShadowArscAssetManager10.java:747) at android.content.res.AssetManager.nativeOpenAsset(AssetManager.java) at android.content.res.AssetManager.open(AssetManager.java:874) at android.content.res.AssetManager.open(AssetManager.java:851) at androidx.media3.test.utils.TestUtil.getInputStream(TestUtil.java:171) at androidx.media3.test.utils.TestUtil.getByteArray(TestUtil.java:166) at androidx.media3.test.utils.TestUtil.getString(TestUtil.java:176) at androidx.media3.test.utils.DumpFileAsserts.assertOutput(DumpFileAsserts.java:161) at androidx.media3.test.utils.DumpFileAsserts.assertOutput(DumpFileAsserts.java:95) at androidx.media3.test.utils.ExtractorAsserts.assertOutput(ExtractorAsserts.java:454) at androidx.media3.test.utils.ExtractorAsserts.assertBehavior(ExtractorAsserts.java:398) at androidx.media3.test.utils.ExtractorAsserts.assertBehavior(ExtractorAsserts.java:354) at androidx.media3.extractor.ts.TsExtractorTest.sampleWithDts(TsExtractorTest.java:119) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)

rohitjoins · 2023-03-24T14:50:01Z

@rahulnmohan The error is complaining about not finding the dump file for the sample test file you added. As mentioned in the error log, you'll need to temporarily modify this line in DumpFileAsserts from COMPARE_WITH_EXISTING to WRITE_TO_LOCAL and run the tests which will add/create the dump files with data for this new file. You can revert back this change once the new dump file is created. Dump file is data against which the test verifies the sample file when tests are run.

rahulnmohan · 2023-03-27T04:52:47Z

@rohitjoins Thanks for the prompt reply. I have added test cases for the TS extractor updates. Would you please review it?

rohitjoins · 2023-03-27T09:49:12Z

@rahulnmohan Thanks for adding the tests and sample files. One more request would be to minimise the size of the sample files(possibly down to single number digit of samples) and still maintain test coverage for them. We try to keep the test media duration reasonably short, so tests run faster and to avoid having a huge directory of binaries that everyone cloning the project externally has to check out.

rahulnmohan · 2023-03-28T12:15:48Z

@rohitjoins Thanks for reviewing the changes.
Currently, I have submitted the same test streams which we added in the Android CTS. I will try for getting shorter streams. Thanks.

rohitjoins · 2023-03-28T12:28:40Z

@rahulnmohan One alternative suggestion could be to consider safely truncating the streams that were included in the tests.

rahulnmohan · 2023-04-04T07:26:35Z

@rohitjoins I have updated the DTS test vectors. Would you please check if the file size is shorter enough to mainline?

libraries/extractor/src/main/java/androidx/media3/extractor/DtsUtil.java

libraries/extractor/src/main/java/androidx/media3/extractor/ts/DtsUhdReader.java

rahulnmohan · 2023-04-20T04:27:37Z

Hi @rohitjoins, please let me know if any further action is required from my side to merge these changes to the main branch. Thanks.

rohitjoins · 2023-04-20T08:20:40Z

Hi @rahulnmohan,

No at the moment. I have sent a PR internally for this change and is in the process of getting it reviewed. Will let you know if there is some major doubt/confusion over anything. Otherwise, should merge this soon. Thanks.

libraries/extractor/src/main/java/androidx/media3/extractor/ts/DtsUhdReader.java

rahulnmohan · 2023-07-04T04:54:38Z

Hi @rohitjoins ,
a gentle reminder of this pull request.
Would it be possible to share a tentative timeline to have these changes merged into the main branch?
Thank you.

rohitjoins · 2023-07-04T12:04:59Z

@rahulnmohan

Please refrain from pushing any more changes as it will complicate the internal review. I would try my best to include this change into our next release i.e. 1.2.0. Thanks.

rohitjoins

Sorry for replying on this after so long.

libraries/extractor/src/main/java/androidx/media3/extractor/DtsUtil.java

libraries/extractor/src/main/java/androidx/media3/extractor/ts/DtsUhdReader.java

libraries/extractor/src/main/java/androidx/media3/extractor/DtsUtil.java

libraries/extractor/src/main/java/androidx/media3/extractor/ts/DtsUhdReader.java

…actor.

…reamReader

…the DtsUtil.

rohitjoins

Hi @rahulmohan,

Please see three new comments added to resolve the final few things which is unclear to us to merge this PR.

libraries/extractor/src/main/java/androidx/media3/extractor/ts/DtsReader.java

libraries/extractor/src/main/java/androidx/media3/extractor/DtsUtil.java

…UHD header size. Update comments in the time stamp extraction code.

rahulnmohan · 2023-12-14T10:21:50Z

Hi @rohitjoins
Please let me know if I need to further clarify anything in this thread.

rohitjoins · 2023-12-14T10:27:18Z

Hi @rahulnmohan,

Yes, please look at the comment in L445 in DtsUtil.Java. I have also tagged you there to have your attention.

rahulnmohan · 2023-12-19T10:55:57Z

@rohitjoins, Please see my reply here #275 (comment)

rohitjoins · 2023-12-20T17:13:23Z

@rahulnmohan, can you please see the comment and reply.

rohitjoins

Also added three other comments:
comment1
comment2
comment3

Please resolve these last few comments to make further progress in the merge process of this PR.

rohitjoins · 2023-12-22T15:59:11Z

libraries/extractor/src/main/java/androidx/media3/extractor/ts/DtsReader.java

+          break;
+        case STATE_FINDING_EXTSS_HEADER_SIZE:
+          // Read enough bytes to parse the header size information.
+          if (continueRead(data, headerScratchBytes.getData(), /* targetLength= */ 10)) {


Do we intend to read 10 bytes here or just 6 as bytesRead is set to 4 when skipToNextSync is called?

May be we need to reset bytesRead (to zero?) each time we change state and start reading a new 'part' of the file with a different targetLength?

@rohitjoins, To parse the ExtSS header size, 7 bytes is enough. The 'continueRead()' function handles the size of any extra bytes read before.
int bytesToRead = min(source.bytesLeft(), targetLength - bytesRead);

libraries/extractor/src/main/java/androidx/media3/extractor/ts/DtsReader.java

…umber of bytes(7 bytes) to extract the ExtSS header size.

Imported from GitHub PR #275 Added below mentioned features. - Support for extracting DTS LBR(DTS Express) and DTS UHD Profile 2(DTS:X) descriptor ID from PSI PMT - The DTSReader class is updated for extracting a DTS LBR. - Newly added DtsUhdReader class for extracting DTS UHD frame. - The DTSUtil class is updated to parse the DTS LBR or DTS UHD frame and report the format information. Feature request for ExoPlayer: google/ExoPlayer#11075 Merge 21efa08 into 104cfc3 COPYBARA_INTEGRATE_REVIEW=#275 from rahulnmohan:dts-mpeg2ts-update 21efa08 PiperOrigin-RevId: 598854998

rohitjoins · 2024-01-16T16:57:29Z

@rahulnmohan, the PR was merged as 27c021f to the main branch.

Will be released with 1.3.0.

…TS:X Profile2 Imported from GitHub PR androidx/media#275 Added below mentioned features. - Support for extracting DTS LBR(DTS Express) and DTS UHD Profile 2(DTS:X) descriptor ID from PSI PMT - The DTSReader class is updated for extracting a DTS LBR. - Newly added DtsUhdReader class for extracting DTS UHD frame. - The DTSUtil class is updated to parse the DTS LBR or DTS UHD frame and report the format information. Feature request for ExoPlayer: #11075 Merge 21efa0810db31550d6b215639f9ca2af6a32139a into 104cfc3 COPYBARA_INTEGRATE_REVIEW=androidx/media#275 from rahulnmohan:dts-mpeg2ts-update 21efa0810db31550d6b215639f9ca2af6a32139a PiperOrigin-RevId: 598854998

rahulnmohan · 2024-01-16T18:23:31Z

@rohitjoins, Thank you very much for the great help and the extended review.

rahulnmohan mentioned this pull request Mar 22, 2023

Add DTS-LBR and DTS:X support in MPEG2-TS extractor google/ExoPlayer#11076

Closed

rohitjoins mentioned this pull request Mar 22, 2023

Add DTS-LBR and DTS:X support in MPEG2-TS extractor google/ExoPlayer#11075

Closed

rohitjoins self-assigned this Mar 22, 2023

rohitjoins reviewed Apr 5, 2023

View reviewed changes

libraries/extractor/src/main/java/androidx/media3/extractor/DtsUtil.java Outdated Show resolved Hide resolved

rohitjoins reviewed Apr 5, 2023

View reviewed changes

libraries/extractor/src/main/java/androidx/media3/extractor/DtsUtil.java Show resolved Hide resolved

rohitjoins reviewed Apr 5, 2023

View reviewed changes

libraries/extractor/src/main/java/androidx/media3/extractor/DtsUtil.java Outdated Show resolved Hide resolved

rohitjoins reviewed Apr 5, 2023

View reviewed changes

libraries/extractor/src/main/java/androidx/media3/extractor/ts/DtsUhdReader.java Outdated Show resolved Hide resolved

rohitjoins added the should merge label Apr 20, 2023

rohitjoins reviewed Apr 26, 2023

View reviewed changes

libraries/extractor/src/main/java/androidx/media3/extractor/ts/DtsUhdReader.java Outdated Show resolved Hide resolved

rohitjoins reviewed Sep 6, 2023

View reviewed changes

rahulmohan-xperi and others added 6 commits September 6, 2023 18:18

Add DTS-LBR and DTS:X support in MPEG2-TS extractor

ed9806a

Add tests for the LBR and DTS:X stream support added in MPEG2-TS extr…

4d25f01

…actor.

Update DTS test vectors

bc35938

Fix the potential NullPointerException in DtsUhdReader

412414e

Fix build issue in DtsUhdReader caused by the updates in ElementarySt…

cc2904f

…reamReader

Various changes in response to internal review

4c173c7

rohitjoins force-pushed the dts-mpeg2ts-update branch from ed9c241 to 4c173c7 Compare September 6, 2023 17:25

rahulmohan-xperi and others added 2 commits October 9, 2023 19:20

Keep the DTS UHD parser state information in the DtsReader insted of …

39cd88d

…the DtsUtil.

Changes based on internal review

42d6f0a

rohitjoins reviewed Nov 27, 2023

View reviewed changes

libraries/extractor/src/main/java/androidx/media3/extractor/ts/DtsReader.java Show resolved Hide resolved

libraries/extractor/src/main/java/androidx/media3/extractor/DtsUtil.java Show resolved Hide resolved

Reduce the number of bytes read from bitstream buffer to extract the …

b8f0350

…UHD header size. Update comments in the time stamp extraction code.

rohitjoins added need more info and removed should merge labels Dec 6, 2023

Establish the synchronization only in the FTOC sync frames.

01ca64c

google-oss-bot added the stale label Dec 7, 2023

This comment was marked as off-topic.

Sign in to view

rohitjoins added pending comments and removed stale need more info labels Dec 7, 2023

Updated DTS UHD test vector to contain multiple sync frames.

7ba1684

rohitjoins reviewed Dec 22, 2023

View reviewed changes

rohitjoins reviewed Jan 3, 2024

View reviewed changes

libraries/extractor/src/main/java/androidx/media3/extractor/ts/DtsReader.java Show resolved Hide resolved

Set uhdAudioChunkId to 0 in seek() function. Read only the required n…

289a0c6

…umber of bytes(7 bytes) to extract the ExtSS header size.

rohitjoins added should merge and removed pending comments labels Jan 16, 2024

rohitjoins closed this Jan 16, 2024

rohitjoins reopened this Jan 16, 2024

rohitjoins closed this Jan 16, 2024

androidx locked and limited conversation to collaborators Mar 17, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Dts mpeg2ts update #275

Dts mpeg2ts update #275

rahulnmohan commented Mar 22, 2023 •

edited

rohitjoins commented Mar 22, 2023

rahulnmohan commented Mar 23, 2023

rahulnmohan commented Mar 24, 2023

rohitjoins commented Mar 24, 2023

rahulnmohan commented Mar 27, 2023

rohitjoins commented Mar 27, 2023

rahulnmohan commented Mar 28, 2023

rohitjoins commented Mar 28, 2023

rahulnmohan commented Apr 4, 2023

rahulnmohan commented Apr 20, 2023

rohitjoins commented Apr 20, 2023

rahulnmohan commented Jul 4, 2023

rohitjoins commented Jul 4, 2023

rohitjoins left a comment

rohitjoins left a comment

This comment was marked as off-topic.

rahulnmohan commented Dec 14, 2023

rohitjoins commented Dec 14, 2023

rahulnmohan commented Dec 19, 2023

rohitjoins commented Dec 20, 2023

rohitjoins left a comment

rohitjoins Dec 22, 2023

rahulnmohan Jan 3, 2024

rohitjoins commented Jan 16, 2024

rahulnmohan commented Jan 16, 2024

Dts mpeg2ts update #275

Dts mpeg2ts update #275

Conversation

rahulnmohan commented Mar 22, 2023 • edited

rohitjoins commented Mar 22, 2023

rahulnmohan commented Mar 23, 2023

rahulnmohan commented Mar 24, 2023

rohitjoins commented Mar 24, 2023

rahulnmohan commented Mar 27, 2023

rohitjoins commented Mar 27, 2023

rahulnmohan commented Mar 28, 2023

rohitjoins commented Mar 28, 2023

rahulnmohan commented Apr 4, 2023

rahulnmohan commented Apr 20, 2023

rohitjoins commented Apr 20, 2023

rahulnmohan commented Jul 4, 2023

rohitjoins commented Jul 4, 2023

rohitjoins left a comment

Choose a reason for hiding this comment

rohitjoins left a comment

Choose a reason for hiding this comment

This comment was marked as off-topic.

rahulnmohan commented Dec 14, 2023

rohitjoins commented Dec 14, 2023

rahulnmohan commented Dec 19, 2023

rohitjoins commented Dec 20, 2023

rohitjoins left a comment

Choose a reason for hiding this comment

rohitjoins Dec 22, 2023

Choose a reason for hiding this comment

rahulnmohan Jan 3, 2024

Choose a reason for hiding this comment

rohitjoins commented Jan 16, 2024

rahulnmohan commented Jan 16, 2024

rahulnmohan commented Mar 22, 2023 •

edited