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

Commit 1f16f12b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "transcoder: add hevc->avc unit test and verify formats."

parents 1439f5a0 5855ee55

media/libmediatranscoding/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ cc_library_shared { 
        "TranscodingJobScheduler.cpp",

        "TranscodingUidPolicy.cpp",

        "TranscoderWrapper.cpp",

        "NdkCommon.cpp",

    ],



    shared_libs: [

media/libmediatranscoding/TranscoderWrapper.cpp

+4 −4
Original line number Diff line number Diff line
@@ -200,12 +200,12 @@ static AMediaFormat* getVideoFormat( 


    AMediaFormat* format = AMediaFormat_new();

    bool changed = false;

    if (requestedFormat->codecType == TranscodingVideoCodecType::kHevc

            && strcmp(originalMime, AMEDIA_MIMETYPE_VIDEO_HEVC)) {

    if (requestedFormat->codecType == TranscodingVideoCodecType::kHevc &&

        strcmp(originalMime, AMEDIA_MIMETYPE_VIDEO_HEVC)) {

        AMediaFormat_setString(format, AMEDIAFORMAT_KEY_MIME, AMEDIA_MIMETYPE_VIDEO_HEVC);

        changed = true;

    } else if (requestedFormat->codecType == TranscodingVideoCodecType::kAvc

        && strcmp(originalMime, AMEDIA_MIMETYPE_VIDEO_AVC)) {

    } else if (requestedFormat->codecType == TranscodingVideoCodecType::kAvc &&

               strcmp(originalMime, AMEDIA_MIMETYPE_VIDEO_AVC)) {

        AMediaFormat_setString(format, AMEDIAFORMAT_KEY_MIME, AMEDIA_MIMETYPE_VIDEO_AVC);

        changed = true;

    }

media/libmediatranscoding/transcoder/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ cc_library_shared { 
        "MediaSampleWriter.cpp",

        "MediaTrackTranscoder.cpp",

        "MediaTranscoder.cpp",

        "NdkCommon.cpp",

        "PassthroughTrackTranscoder.cpp",

        "VideoTrackTranscoder.cpp",

    ],

media/libmediatranscoding/NdkCommon.cpp→media/libmediatranscoding/transcoder/NdkCommon.cpp

+1 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */

//#define LOG_NDEBUG 0

#define LOG_TAG "NdkCommon"



#include <log/log.h>

#include <media/NdkCommon.h>
@@ -37,4 +38,3 @@ const char* AMEDIA_MIMETYPE_VIDEO_H263 = "video/3gpp"; 
const char* TBD_AMEDIACODEC_PARAMETER_KEY_REQUEST_SYNC_FRAME = "request-sync";

const char* TBD_AMEDIACODEC_PARAMETER_KEY_VIDEO_BITRATE = "video-bitrate";

const char* TBD_AMEDIACODEC_PARAMETER_KEY_MAX_B_FRAMES = "max-bframes";
 
const char* TBD_AMEDIAFORMAT_KEY_BIT_RATE_MODE = "bitrate-mode";

media/libmediatranscoding/include/media/NdkCommon.h→media/libmediatranscoding/transcoder/include/media/NdkCommon.h

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ static constexpr int COLOR_FormatSurface = 0x7f000789; 
extern const char* TBD_AMEDIACODEC_PARAMETER_KEY_REQUEST_SYNC_FRAME;

extern const char* TBD_AMEDIACODEC_PARAMETER_KEY_VIDEO_BITRATE;

extern const char* TBD_AMEDIACODEC_PARAMETER_KEY_MAX_B_FRAMES;

extern const char* TBD_AMEDIAFORMAT_KEY_BIT_RATE_MODE;

static constexpr int TBD_AMEDIACODEC_BUFFER_FLAG_KEY_FRAME = 0x1;



static constexpr int kBitrateModeConstant = 2;