| commit | fb60b790f80dc68b94b159b37a94cb7f922e7f6c | [log] [tgz] |
|---|---|---|
| author | Fyodor Kyslov <kyslov@google.com> | Thu Jun 08 02:19:37 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 08 02:19:37 2023 +0000 |
| tree | 2ced7ef58e381d31c7e014b4ec65427055dad44e | |
| parent | 5b426ac13e8210b255bcc810882e8a6205673b57 [diff] | |
| parent | ecc9843c2a079f6c22058b6562028c2f04d27014 [diff] |
AV1 Encoder: Add AV1 to supported types of MediaRecorder am: ecc9843c2a Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/23603272 Change-Id: Ib5c99c861ccb2ccb21ab2737f06f7923166e338e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp index ec79b99..0365085 100644 --- a/media/libmediaplayerservice/StagefrightRecorder.cpp +++ b/media/libmediaplayerservice/StagefrightRecorder.cpp
@@ -1986,6 +1986,10 @@ format->setString("mime", MEDIA_MIMETYPE_VIDEO_DOLBY_VISION); break; + case VIDEO_ENCODER_AV1: + format->setString("mime", MEDIA_MIMETYPE_VIDEO_AV1); + break; + default: CHECK(!"Should not be here, unsupported video encoding."); break;
diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp index c93d033..b84dc27 100644 --- a/media/libstagefright/MPEG4Writer.cpp +++ b/media/libstagefright/MPEG4Writer.cpp
@@ -3581,7 +3581,7 @@ (const uint8_t *)buffer->data() + buffer->range_offset(), buffer->range_length()); - } else if (mIsMPEG4) { + } else if (mIsMPEG4 || mIsAv1) { err = copyCodecSpecificData((const uint8_t *)buffer->data() + buffer->range_offset(), buffer->range_length()); }