Fix webm writer
Webm writer still made use of kKeyVorbisInfo. Fix it, and remove that
key altogether.
Bug: 128994325
Test: CTS
Change-Id: I38b73871c1db65fa66416892934d2a697719cca3
diff --git a/media/libstagefright/include/media/stagefright/MetaDataBase.h b/media/libstagefright/include/media/stagefright/MetaDataBase.h
index 75fd0d9..0a63140 100644
--- a/media/libstagefright/include/media/stagefright/MetaDataBase.h
+++ b/media/libstagefright/include/media/stagefright/MetaDataBase.h
@@ -62,8 +62,6 @@
kKeyAV1C = 'av1c', // raw data
kKeyThumbnailHVCC = 'thvc', // raw data
kKeyD263 = 'd263', // raw data
- kKeyVorbisInfo = 'vinf', // raw data
- kKeyVorbisBooks = 'vboo', // raw data
kKeyOpusHeader = 'ohdr', // raw data
kKeyOpusCodecDelay = 'ocod', // uint64_t (codec delay in ns)
kKeyOpusSeekPreRoll = 'ospr', // uint64_t (seek preroll in ns)
diff --git a/media/libstagefright/webm/WebmWriter.cpp b/media/libstagefright/webm/WebmWriter.cpp
index b0a303e..26e0884 100644
--- a/media/libstagefright/webm/WebmWriter.cpp
+++ b/media/libstagefright/webm/WebmWriter.cpp
@@ -177,8 +177,8 @@
const void *headerData3;
size_t headerSize1, headerSize2 = sizeof(headerData2), headerSize3;
- if (!md->findData(kKeyVorbisInfo, &type, &headerData1, &headerSize1)
- || !md->findData(kKeyVorbisBooks, &type, &headerData3, &headerSize3)) {
+ if (!md->findData(kKeyOpaqueCSD0, &type, &headerData1, &headerSize1)
+ || !md->findData(kKeyOpaqueCSD1, &type, &headerData3, &headerSize3)) {
ALOGE("Missing header format keys for vorbis track");
md->dumpToLog();
return NULL;