libvpx2.patch

   1 --- comm-release/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc~ 2014-06-13 02:45:44.000000000 +0200
   2 +++ comm-release/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc  2015-05-23 22:04:53.241382776 +0200
   3 @@ -180,7 +180,7 @@
   4    // Creating a wrapper to the image - setting image data to NULL. Actual
   5    // pointer will be set in encode. Setting align to 1, as it is meaningless
   6    // (actual memory is not allocated).
   7 -  raw_ = vpx_img_wrap(NULL, IMG_FMT_I420, codec_.width, codec_.height,
   8 +  raw_ = vpx_img_wrap(NULL, VPX_IMG_FMT_I420, codec_.width, codec_.height,
   9                        1, NULL);
  10    // populate encoder configuration with default values
  11    if (vpx_codec_enc_config_default(vpx_codec_vp8_cx(), config_, 0)) {
  12 @@ -349,9 +349,9 @@
  13    }
  14    // Image in vpx_image_t format.
  15    // Input image is const. VP8's raw image is not defined as const.
  16 -  raw_->planes[PLANE_Y] = const_cast<uint8_t*>(input_image.buffer(kYPlane));
  17 -  raw_->planes[PLANE_U] = const_cast<uint8_t*>(input_image.buffer(kUPlane));
  18 -  raw_->planes[PLANE_V] = const_cast<uint8_t*>(input_image.buffer(kVPlane));
  19 +  raw_->planes[VPX_PLANE_Y] = const_cast<uint8_t*>(input_image.buffer(kYPlane));
  20 +  raw_->planes[VPX_PLANE_U] = const_cast<uint8_t*>(input_image.buffer(kUPlane));
  21 +  raw_->planes[VPX_PLANE_V] = const_cast<uint8_t*>(input_image.buffer(kVPlane));
  22    // TODO(mikhal): Stride should be set in initialization.
  23    raw_->stride[VPX_PLANE_Y] = input_image.stride(kYPlane);
  24    raw_->stride[VPX_PLANE_U] = input_image.stride(kUPlane);
  25 --- mozilla/mozilla/content/media/encoder/VP8TrackEncoder.cpp~  2015-02-25 19:21:17.000000000 +0100
  26 +++ mozilla/mozilla/content/media/encoder/VP8TrackEncoder.cpp   2015-05-23 22:11:33.299057650 +0200
  27 @@ -84,7 +84,7 @@
  28    // Creating a wrapper to the image - setting image data to NULL. Actual
  29    // pointer will be set in encode. Setting align to 1, as it is meaningless
  30    // (actual memory is not allocated).
  31 -  vpx_img_wrap(mVPXImageWrapper, IMG_FMT_I420,
  32 +  vpx_img_wrap(mVPXImageWrapper, VPX_IMG_FMT_I420,
  33                 mFrameWidth, mFrameHeight, 1, nullptr);
  34
  35    config.g_w = mFrameWidth;
  36 @@ -239,9 +239,9 @@
  37    uint8_t *cb = mMuteFrame.Elements() + yPlaneSize;
  38    uint8_t *cr = mMuteFrame.Elements() + yPlaneSize + uvPlaneSize;
  39
  40 -  mVPXImageWrapper->planes[PLANE_Y] = y;
  41 -  mVPXImageWrapper->planes[PLANE_U] = cb;
  42 -  mVPXImageWrapper->planes[PLANE_V] = cr;
  43 +  mVPXImageWrapper->planes[VPX_PLANE_Y] = y;
  44 +  mVPXImageWrapper->planes[VPX_PLANE_U] = cb;
  45 +  mVPXImageWrapper->planes[VPX_PLANE_V] = cr;
  46    mVPXImageWrapper->stride[VPX_PLANE_Y] = mFrameWidth;
  47    mVPXImageWrapper->stride[VPX_PLANE_U] = halfWidth;
  48    mVPXImageWrapper->stride[VPX_PLANE_V] = halfWidth;
  49 @@ -297,9 +297,9 @@
  50      const PlanarYCbCrImage::Data *data = yuv->GetData();
  51
  52      if (isYUV420(data) && !data->mCbSkip) { // 420 planar
  53 -      mVPXImageWrapper->planes[PLANE_Y] = data->mYChannel;
  54 -      mVPXImageWrapper->planes[PLANE_U] = data->mCbChannel;
  55 -      mVPXImageWrapper->planes[PLANE_V] = data->mCrChannel;
  56 +      mVPXImageWrapper->planes[VPX_PLANE_Y] = data->mYChannel;
  57 +      mVPXImageWrapper->planes[VPX_PLANE_U] = data->mCbChannel;
  58 +      mVPXImageWrapper->planes[VPX_PLANE_V] = data->mCrChannel;
  59        mVPXImageWrapper->stride[VPX_PLANE_Y] = data->mYStride;
  60        mVPXImageWrapper->stride[VPX_PLANE_U] = data->mCbCrStride;
  61        mVPXImageWrapper->stride[VPX_PLANE_V] = data->mCbCrStride;
  62 @@ -355,9 +355,9 @@
  63          return NS_ERROR_NOT_IMPLEMENTED;
  64        }
  65
  66 -      mVPXImageWrapper->planes[PLANE_Y] = y;
  67 -      mVPXImageWrapper->planes[PLANE_U] = cb;
  68 -      mVPXImageWrapper->planes[PLANE_V] = cr;
  69 +      mVPXImageWrapper->planes[VPX_PLANE_Y] = y;
  70 +      mVPXImageWrapper->planes[VPX_PLANE_U] = cb;
  71 +      mVPXImageWrapper->planes[VPX_PLANE_V] = cr;
  72        mVPXImageWrapper->stride[VPX_PLANE_Y] = mFrameWidth;
  73        mVPXImageWrapper->stride[VPX_PLANE_U] = halfWidth;
  74        mVPXImageWrapper->stride[VPX_PLANE_V] = halfWidth;