Commit f926eaf8 authored by Tom Schuster's avatar Tom Schuster Committed by Pier Angelo Vendrame
Browse files

Bug 2025281 - Cleanup MediaIPCUtils. a=diannaS 

Original Revision: https://phabricator.services.mozilla.com/D289190

Differential Revision: https://phabricator.services.mozilla.com/D290479
parent df25c43c

dom/media/ipc/MediaIPCUtils.h

+30 −30
Original line number Diff line number Diff line
@@ -42,14 +42,12 @@ struct ParamTraits<mozilla::VideoInfo> { 
    WriteParam(aWriter, aParam.mColorPrimaries);

    WriteParam(aWriter, aParam.mTransferFunction);

    WriteParam(aWriter, aParam.mColorRange);

    WriteParam(aWriter, aParam.HasAlpha());

    WriteParam(aWriter, aParam.mAlphaPresent);

    WriteParam(aWriter, aParam.mCrypto);

  }



  static bool Read(MessageReader* aReader, paramType* aResult) {

    mozilla::gfx::IntRect imageRect;

    bool alphaPresent;

    if (ReadParam(aReader, &aResult->mMimeType) &&

    return ReadParam(aReader, &aResult->mMimeType) &&

           ReadParam(aReader, &aResult->mDisplay) &&

           ReadParam(aReader, &aResult->mStereoMode) &&

           ReadParam(aReader, &aResult->mImage) &&
@@ -62,12 +60,8 @@ struct ParamTraits<mozilla::VideoInfo> { 
           ReadParam(aReader, &aResult->mColorPrimaries) &&

           ReadParam(aReader, &aResult->mTransferFunction) &&

           ReadParam(aReader, &aResult->mColorRange) &&

        ReadParam(aReader, &alphaPresent) &&

        ReadParam(aReader, &aResult->mCrypto)) {

      aResult->SetAlpha(alphaPresent);

      return true;

    }

    return false;

           ReadParam(aReader, &aResult->mAlphaPresent) &&

           ReadParam(aReader, &aResult->mCrypto);

  }

};
@@ -236,6 +230,10 @@ struct ParamTraits<mozilla::media::TimeUnit> { 
    if (ReadParam(aReader, &valid) && ReadParam(aReader, &ticks) &&

        ReadParam(aReader, &base)) {

      if (valid) {

        if (base <= 0 || base > int64_t(UINT32_MAX)) {

          return false;

        }



        *aResult = mozilla::media::TimeUnit(ticks, base);

      } else {

        *aResult = mozilla::media::TimeUnit::Invalid();
@@ -319,23 +317,25 @@ struct ParamTraits<mozilla::DecoderDoctorDiagnostics::DiagnosticsType> 
          mozilla::DecoderDoctorDiagnostics::DiagnosticsType::eDecodeWarning> {

};



template <>

struct ParamTraits<mozilla::DecoderDoctorEvent::Domain>

    : public ContiguousEnumSerializerInclusive<

          mozilla::DecoderDoctorEvent::Domain,

          mozilla::DecoderDoctorEvent::Domain::eAudioSinkStartup,

          mozilla::DecoderDoctorEvent::Domain::eAudioSinkStartup> {};



template <>

struct ParamTraits<mozilla::DecoderDoctorEvent> {

  typedef mozilla::DecoderDoctorEvent paramType;



  static void Write(MessageWriter* aWriter, const paramType& aParam) {

    int domain = aParam.mDomain;

    WriteParam(aWriter, domain);

    WriteParam(aWriter, aParam.mDomain);

    WriteParam(aWriter, aParam.mResult);

  }



  static bool Read(MessageReader* aReader, paramType* aResult) {

    int domain = 0;

    if (ReadParam(aReader, &domain) && ReadParam(aReader, &aResult->mResult)) {

      aResult->mDomain = paramType::Domain(domain);

      return true;

    }

    return false;

    return ReadParam(aReader, &aResult->mDomain) &&

           ReadParam(aReader, &aResult->mResult);

  };

};