| commit | d54a48095563c2496588c06c1eaf8f5e717fb200 | [log] [tgz] |
|---|---|---|
| author | Sungtak Lee <taklee@google.com> | Tue Mar 22 23:19:11 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 22 23:19:11 2022 +0000 |
| tree | 51f8ce3b31e5a53a9c009aee09a7bc8883bcfe7c | |
| parent | a3b738917d6794ef0f05cf2715871fd761544188 [diff] | |
| parent | c4d6cd214e00b3b6ec85efb5fd2c1a8b529aa12b [diff] |
Merge "Fix the issue that rtsp video with MP4V-ES/ can't be played." am: 9bdfe6d8ab am: 47332375f9 am: c4d6cd214e Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2005510 Change-Id: I2e776fbf142a3f20567e74e363c9b2c2e1b956d0
diff --git a/media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp b/media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp index 6b1d2a1..1c8eef5 100644 --- a/media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp +++ b/media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp
@@ -204,7 +204,7 @@ }; bool AMPEG4ElementaryAssembler::initCheck() { - if(mSizeLength == 0 || mIndexLength == 0 || mIndexDeltaLength == 0) { + if(mIsGeneric && (mSizeLength == 0 || mIndexLength == 0 || mIndexDeltaLength == 0)) { android_errorWriteLog(0x534e4554, "124777537"); return false; }