| commit | ecc9843c2a079f6c22058b6562028c2f04d27014 | [log] [tgz] |
|---|---|---|
| author | Fyodor Kyslov <kyslov@google.com> | Wed Jun 07 00:19:37 2023 +0000 |
| committer | Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | Wed Jun 07 17:56:14 2023 +0000 |
| tree | 2ced7ef58e381d31c7e014b4ec65427055dad44e | |
| parent | 0913cb17a0584f0140a2e082ab7fefb3054901e2 [diff] |
AV1 Encoder: Add AV1 to supported types of MediaRecorder Adds AV1 to supported types of MediaRecorder and fixes MP4 writer Bug: b/285972478 Test: atest MediaRecorderTest#testAV1SDRecording (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:03dd7d46d318ae05a1466ceb87b01a34e057337e) Merged-In: I8292665f21f3f836a0f67891322cfee41d78f327 Change-Id: I8292665f21f3f836a0f67891322cfee41d78f327
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()); }