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

Commit 647f9bc5 authored by Lajos Molnar's avatar Lajos Molnar Committed by Automerger Merge Worker
Browse files

Merge "media: Rename ImageDecoder class" into sc-dev am: 2c5c60cf am: 392f45bf 

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

Change-Id: I451b0e9e5fc45c773a012e4c7369419c1fe38c09
parents cb1bad67 392f45bf

media/libmediaplayerservice/StagefrightMetadataRetriever.cpp

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ sp<IMemory> StagefrightMetadataRetriever::getImageInternal( 


    for (size_t i = 0; i < matchingCodecs.size(); ++i) {

        const AString &componentName = matchingCodecs[i];

        sp<ImageDecoder> decoder = new ImageDecoder(componentName, trackMeta, source);

        sp<MediaImageDecoder> decoder = new MediaImageDecoder(componentName, trackMeta, source);

        int64_t frameTimeUs = thumbnail ? -1 : 0;

        if (decoder->init(frameTimeUs, 0 /*option*/, colorFormat) == OK) {

            sp<IMemory> frame = decoder->extractFrame(rect);

media/libstagefright/FrameDecoder.cpp

+4 −4
Original line number Diff line number Diff line
@@ -741,7 +741,7 @@ status_t VideoFrameDecoder::captureSurface() { 


////////////////////////////////////////////////////////////////////////



ImageDecoder::ImageDecoder(

MediaImageDecoder::MediaImageDecoder(

        const AString &componentName,

        const sp<MetaData> &trackMeta,

        const sp<IMediaSource> &source)
@@ -757,7 +757,7 @@ ImageDecoder::ImageDecoder( 
      mTargetTiles(0) {

}



sp<AMessage> ImageDecoder::onGetFormatAndSeekOptions(

sp<AMessage> MediaImageDecoder::onGetFormatAndSeekOptions(

        int64_t frameTimeUs, int /*seekMode*/,

        MediaSource::ReadOptions *options, sp<Surface> * /*window*/) {

    sp<MetaData> overrideMeta;
@@ -833,7 +833,7 @@ sp<AMessage> ImageDecoder::onGetFormatAndSeekOptions( 
    return videoFormat;

}



status_t ImageDecoder::onExtractRect(FrameRect *rect) {

status_t MediaImageDecoder::onExtractRect(FrameRect *rect) {

    // TODO:

    // This callback is for verifying whether we can decode the rect,

    // and if so, set up the internal variables for decoding.
@@ -872,7 +872,7 @@ status_t ImageDecoder::onExtractRect(FrameRect *rect) { 
    return OK;

}



status_t ImageDecoder::onOutputReceived(

status_t MediaImageDecoder::onOutputReceived(

        const sp<MediaCodecBuffer> &videoFrameBuffer,

        const sp<AMessage> &outputFormat, int64_t /*timeUs*/, bool *done) {

    if (outputFormat == NULL) {

media/libstagefright/include/FrameDecoder.h

+2 −2
Original line number Diff line number Diff line
@@ -146,8 +146,8 @@ private: 
    status_t captureSurface();

};



struct ImageDecoder : public FrameDecoder {

    ImageDecoder(

struct MediaImageDecoder : public FrameDecoder {

   MediaImageDecoder(

            const AString &componentName,

            const sp<MetaData> &trackMeta,

            const sp<IMediaSource> &source);

media/libstagefright/tests/fuzzers/FrameDecoderFuzzer.cpp

+1 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { 
    if (isVideoDecoder) {

        decoder = new VideoFrameDecoder(componentName, trackMeta, source);

    } else {

        decoder = new ImageDecoder(componentName, trackMeta, source);

        decoder = new MediaImageDecoder(componentName, trackMeta, source);

    }



    while (fdp.remaining_bytes()) {
@@ -80,4 +80,3 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { 
}



}  // namespace android