Commit 9d25af9b authored by Alastor Wu's avatar Alastor Wu
Browse files

Bug 1400758 - part2 : report the error description with InitPromise for agnostic decoders. r=jya 

MozReview-Commit-ID: BxTTHJPwDNq

--HG--
extra : rebase_source : e634e0a7d61da02f258b7736e69afa249dd2c6ee
parent 1dc98ba9

dom/media/platforms/agnostic/AOMDecoder.cpp

+5 −4
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ InitContext(aom_codec_ctx_t* aCtx, 
{

  aom_codec_iface_t* dx = aom_codec_av1_dx();

  if (!dx) {

    return MediaResult(NS_ERROR_FAILURE,

    return MediaResult(NS_ERROR_DOM_MEDIA_FATAL_ERR,

                       RESULT_DETAIL("Couldn't get AV1 decoder interface."));

  }
@@ -57,7 +57,7 @@ InitContext(aom_codec_ctx_t* aCtx, 
  auto res = aom_codec_dec_init(aCtx, dx, &config, flags);

  if (res != AOM_CODEC_OK) {

    LOG_RESULT(res, "Codec initialization failed!");

    return MediaResult(NS_ERROR_FAILURE,

    return MediaResult(NS_ERROR_DOM_MEDIA_FATAL_ERR,

                       RESULT_DETAIL("AOM error initializing AV1 decoder: %s",

                                     aom_codec_err_to_string(res)));

  }
@@ -92,8 +92,9 @@ AOMDecoder::Shutdown() 
RefPtr<MediaDataDecoder::InitPromise>

AOMDecoder::Init()

{

  if (NS_FAILED(InitContext(&mCodec, mInfo))) {

    return AOMDecoder::InitPromise::CreateAndReject(NS_ERROR_DOM_MEDIA_FATAL_ERR,

  MediaResult rv = InitContext(&mCodec, mInfo);

  if (NS_FAILED(rv)) {

    return AOMDecoder::InitPromise::CreateAndReject(rv,

                                                    __func__);

  }

  return AOMDecoder::InitPromise::CreateAndResolve(TrackInfo::kVideoTrack,

dom/media/platforms/agnostic/OpusDecoder.cpp

+12 −3
Original line number Diff line number Diff line
@@ -69,14 +69,20 @@ OpusDataDecoder::Init() 
  uint8_t *p = mInfo.mCodecSpecificConfig->Elements();

  if (length < sizeof(uint64_t)) {

    OPUS_DEBUG("CodecSpecificConfig too short to read codecDelay!");

    return InitPromise::CreateAndReject(NS_ERROR_DOM_MEDIA_FATAL_ERR, __func__);

    return InitPromise::CreateAndReject(

      MediaResult(NS_ERROR_DOM_MEDIA_FATAL_ERR,

                  RESULT_DETAIL("CodecSpecificConfig too short to read codecDelay!")),

      __func__);

  }

  int64_t codecDelay = BigEndian::readUint64(p);

  length -= sizeof(uint64_t);

  p += sizeof(uint64_t);

  if (NS_FAILED(DecodeHeader(p, length))) {

    OPUS_DEBUG("Error decoding header!");

    return InitPromise::CreateAndReject(NS_ERROR_DOM_MEDIA_FATAL_ERR, __func__);

    return InitPromise::CreateAndReject(

      MediaResult(NS_ERROR_DOM_MEDIA_FATAL_ERR,

                  RESULT_DETAIL("Error decoding header!")),

      __func__);

  }



  int r;
@@ -103,7 +109,10 @@ OpusDataDecoder::Init() 
  }



  return r == OPUS_OK ? InitPromise::CreateAndResolve(TrackInfo::kAudioTrack, __func__)

                      : InitPromise::CreateAndReject(NS_ERROR_DOM_MEDIA_FATAL_ERR, __func__);

                      : InitPromise::CreateAndReject(

                          MediaResult(NS_ERROR_DOM_MEDIA_FATAL_ERR,

                          RESULT_DETAIL("could not create opus multistream decoder!")),

                          __func__);

}



nsresult

dom/media/platforms/agnostic/TheoraDecoder.cpp

+16 −5
Original line number Diff line number Diff line
@@ -82,23 +82,34 @@ TheoraDecoder::Init() 
  if (!XiphExtradataToHeaders(headers, headerLens,

      mInfo.mCodecSpecificConfig->Elements(),

      mInfo.mCodecSpecificConfig->Length())) {

    return InitPromise::CreateAndReject(NS_ERROR_DOM_MEDIA_FATAL_ERR, __func__);

    return InitPromise::CreateAndReject(

      MediaResult(NS_ERROR_DOM_MEDIA_FATAL_ERR,

                  RESULT_DETAIL("Could not get theora header.")),

      __func__);

  }

  for (size_t i = 0; i < headers.Length(); i++) {

    if (NS_FAILED(DoDecodeHeader(headers[i], headerLens[i]))) {

      return InitPromise::CreateAndReject(NS_ERROR_DOM_MEDIA_FATAL_ERR,

      return InitPromise::CreateAndReject(

        MediaResult(NS_ERROR_DOM_MEDIA_FATAL_ERR,

                    RESULT_DETAIL("Could not decode theora header.")),

        __func__);

    }

  }

  if (mPacketCount != 3) {

    return InitPromise::CreateAndReject(NS_ERROR_DOM_MEDIA_FATAL_ERR, __func__);

    return InitPromise::CreateAndReject(

      MediaResult(NS_ERROR_DOM_MEDIA_FATAL_ERR,

                  RESULT_DETAIL("Packet count is wrong.")),

      __func__);

  }



  mTheoraDecoderContext = th_decode_alloc(&mTheoraInfo, mTheoraSetupInfo);

  if (mTheoraDecoderContext) {

    return InitPromise::CreateAndResolve(TrackInfo::kVideoTrack, __func__);

  } else {

    return InitPromise::CreateAndReject(NS_ERROR_DOM_MEDIA_FATAL_ERR, __func__);

    return InitPromise::CreateAndReject(

      MediaResult(NS_ERROR_OUT_OF_MEMORY,

                  RESULT_DETAIL("Could not allocate theora decoder.")),

      __func__);

  }



}

dom/media/platforms/agnostic/VorbisDecoder.cpp

+20 −6
Original line number Diff line number Diff line
@@ -75,11 +75,16 @@ VorbisDataDecoder::Init() 
  if (!XiphExtradataToHeaders(headers, headerLens,

                              mInfo.mCodecSpecificConfig->Elements(),

                              mInfo.mCodecSpecificConfig->Length())) {

    return InitPromise::CreateAndReject(NS_ERROR_DOM_MEDIA_FATAL_ERR, __func__);

    return InitPromise::CreateAndReject(

      MediaResult(NS_ERROR_DOM_MEDIA_FATAL_ERR,

                  RESULT_DETAIL("Could not get vorbis header.")),

      __func__);

  }

  for (size_t i = 0; i < headers.Length(); i++) {

    if (NS_FAILED(DecodeHeader(headers[i], headerLens[i]))) {

      return InitPromise::CreateAndReject(NS_ERROR_DOM_MEDIA_FATAL_ERR,

      return InitPromise::CreateAndReject(

        MediaResult(NS_ERROR_DOM_MEDIA_FATAL_ERR,

                    RESULT_DETAIL("Could not decode vorbis header.")),

        __func__);

    }

  }
@@ -88,12 +93,18 @@ VorbisDataDecoder::Init() 


  int r = vorbis_synthesis_init(&mVorbisDsp, &mVorbisInfo);

  if (r) {

    return InitPromise::CreateAndReject(NS_ERROR_DOM_MEDIA_FATAL_ERR, __func__);

    return InitPromise::CreateAndReject(

      MediaResult(NS_ERROR_DOM_MEDIA_FATAL_ERR,

                  RESULT_DETAIL("Systhesis init fail.")),

      __func__);

  }



  r = vorbis_block_init(&mVorbisDsp, &mVorbisBlock);

  if (r) {

    return InitPromise::CreateAndReject(NS_ERROR_DOM_MEDIA_FATAL_ERR, __func__);

    return InitPromise::CreateAndReject(

      MediaResult(NS_ERROR_DOM_MEDIA_FATAL_ERR,

                  RESULT_DETAIL("Block init fail.")),

      __func__);

  }



  if (mInfo.mRate != (uint32_t)mVorbisDsp.vi->rate) {
@@ -107,7 +118,10 @@ VorbisDataDecoder::Init() 


  AudioConfig::ChannelLayout layout(mVorbisDsp.vi->channels);

  if (!layout.IsValid()) {

    return InitPromise::CreateAndReject(NS_ERROR_DOM_MEDIA_FATAL_ERR, __func__);

    return InitPromise::CreateAndReject(

      MediaResult(NS_ERROR_DOM_MEDIA_FATAL_ERR,

                  RESULT_DETAIL("Invalid audio layout.")),

      __func__);

  }



  return InitPromise::CreateAndResolve(TrackInfo::kAudioTrack, __func__);