Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17ac073a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add Dolby Vision profile/level string for codec dump" am: 169f9061... 

Merge "Add Dolby Vision profile/level string for codec dump" am: 169f9061 am: 4517a0cc am: ec55236e

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2618159



Change-Id: Ib27716c5db565fba7fb0dbe11ea2ca0e9b2c0861
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ace82ad5 ec55236e

cmds/stagefright/stagefright.cpp

+3 −1
Original line number Diff line number Diff line
@@ -749,7 +749,8 @@ static void dumpCodecDetails(bool queryDecoders) { 
                        mediaType.equalsIgnoreCase(MIMETYPE_VIDEO_VP8)   ? asString_VP8Profile(pl.mProfile) :

                        mediaType.equalsIgnoreCase(MIMETYPE_VIDEO_HEVC)  ? asString_HEVCProfile(pl.mProfile) :

                        mediaType.equalsIgnoreCase(MIMETYPE_VIDEO_VP9)   ? asString_VP9Profile(pl.mProfile) :

                        mediaType.equalsIgnoreCase(MIMETYPE_VIDEO_AV1)   ? asString_AV1Profile(pl.mProfile) :"??";

                        mediaType.equalsIgnoreCase(MIMETYPE_VIDEO_AV1)   ? asString_AV1Profile(pl.mProfile) :

                        mediaType.equalsIgnoreCase(MIMETYPE_VIDEO_DOLBY_VISION) ? asString_DolbyVisionProfile(pl.mProfile) :"??";

                    const char *niceLevel =

                        mediaType.equalsIgnoreCase(MIMETYPE_VIDEO_MPEG2) ? asString_MPEG2Level(pl.mLevel) :

                        mediaType.equalsIgnoreCase(MIMETYPE_VIDEO_H263)  ? asString_H263Level(pl.mLevel) :
@@ -759,6 +760,7 @@ static void dumpCodecDetails(bool queryDecoders) { 
                        mediaType.equalsIgnoreCase(MIMETYPE_VIDEO_HEVC)  ? asString_HEVCTierLevel(pl.mLevel) :

                        mediaType.equalsIgnoreCase(MIMETYPE_VIDEO_VP9)   ? asString_VP9Level(pl.mLevel) :

                        mediaType.equalsIgnoreCase(MIMETYPE_VIDEO_AV1)   ? asString_AV1Level(pl.mLevel) :

                        mediaType.equalsIgnoreCase(MIMETYPE_VIDEO_DOLBY_VISION) ? asString_DolbyVisionLevel(pl.mLevel) :

                        "??";



                    list.add(AStringPrintf("% 5u/% 5u (%s/%s)",

media/libmediaplayerservice/MediaPlayerService.cpp

+6 −2
Original line number Diff line number Diff line
@@ -388,7 +388,9 @@ static void dumpCodecDetails(int fd, const sp<IMediaCodecList> &codecList, bool 
                        mediaType.equalsIgnoreCase(MIMETYPE_VIDEO_VP9)

                            ? asString_VP9Profile(pl.mProfile) :

                        mediaType.equalsIgnoreCase(MIMETYPE_VIDEO_AV1)

                            ? asString_AV1Profile(pl.mProfile) : "??";

                            ? asString_AV1Profile(pl.mProfile) :

                        mediaType.equalsIgnoreCase(MIMETYPE_VIDEO_DOLBY_VISION)

                            ? asString_DolbyVisionProfile(pl.mProfile) : "??";

                    const char *niceLevel =

                        mediaType.equalsIgnoreCase(MIMETYPE_VIDEO_MPEG2)

                            ? asString_MPEG2Level(pl.mLevel) :
@@ -405,7 +407,9 @@ static void dumpCodecDetails(int fd, const sp<IMediaCodecList> &codecList, bool 
                        mediaType.equalsIgnoreCase(MIMETYPE_VIDEO_VP9)

                            ? asString_VP9Level(pl.mLevel) :

                        mediaType.equalsIgnoreCase(MIMETYPE_VIDEO_AV1)

                            ? asString_AV1Level(pl.mLevel) : "??";

                            ? asString_AV1Level(pl.mLevel) :

                        mediaType.equalsIgnoreCase(MIMETYPE_VIDEO_DOLBY_VISION)

                            ? asString_DolbyVisionLevel(pl.mLevel) : "??";



                    list.add(AStringPrintf("% 5u/% 5u (%s/%s)",

                            pl.mProfile, pl.mLevel, niceProfile, niceLevel));