Packman Build Service PMBS

avidemux3.changes Changed

avidemux3.spec Changed

libavcodec_avcodec.h.patch Added

@@ -0,0 +1,29 @@
+--- libavcodec/avcodec.h.orig	2015-09-10 16:03:09.110337744 +0200
++++ libavcodec/avcodec.h	2015-09-10 16:03:09.132337918 +0200
+@@ -1008,6 +1008,10 @@
+ #define CODEC_FLAG2_DROP_FRAME_TIMECODE AV_CODEC_FLAG2_DROP_FRAME_TIMECODE
+ #define CODEC_FLAG2_IGNORE_CROP   AV_CODEC_FLAG2_IGNORE_CROP
+ 
++//MEANX: NEVER EVER USE CLOSED GOP ?
++#define CODEC_FLAG2_32_PULLDOWN   0x80000000
++// /MEANX
++
+ #define CODEC_FLAG2_CHUNKS        AV_CODEC_FLAG2_CHUNKS
+ #define CODEC_FLAG2_SHOW_ALL      AV_CODEC_FLAG2_SHOW_ALL
+ #define CODEC_FLAG2_EXPORT_MVS    AV_CODEC_FLAG2_EXPORT_MVS
+@@ -2579,6 +2583,7 @@
+      * - decoding: unused
+      */
+     int rc_buffer_size;
++    int rc_buffer_size_header;  /*< That one is set in the header MEANX*/
+ 
+     /**
+      * ratecontrol override, see RcOverride
+@@ -2602,6 +2607,7 @@
+      * - decoding: Set by user, may be overwritten by libavcodec.
+      */
+     int rc_max_rate;
++    int rc_max_rate_header; /*< That one is set in the header MEANX */
+ 
+     /**
+      * minimum bitrate

libavcodec_mpeg12enc.c.patch Changed

@@ -1,18 +1,22 @@
---- libavcodec/mpeg12enc.c.orig	2015-06-10 23:35:03.625383207 +0200
-+++ libavcodec/mpeg12enc.c	2015-06-10 23:35:03.661382526 +0200
-@@ -254,7 +254,7 @@
- 
+--- libavcodec/mpeg12enc.c.orig	2015-09-10 16:03:12.576365227 +0200
++++ libavcodec/mpeg12enc.c	2015-09-10 16:03:12.615365537 +0200
+@@ -256,6 +256,7 @@
          put_sbits(&s->pb, 12, s->width  & 0xFFF);
          put_sbits(&s->pb, 12, s->height & 0xFFF);
--
+ 
 +#if 0 // MEANX
          for (i = 1; i < 15; i++) {
              int64_t error = aspect_ratio.num * (1LL<<32) / aspect_ratio.den;
              if (s->codec_id == AV_CODEC_ID_MPEG1VIDEO || i <= 1)
-@@ -269,12 +269,41 @@
-                 s->aspect_ratio_info = i;
+@@ -271,11 +272,40 @@
              }
          }
+ 
+-        put_bits(&s->pb, 4, s->aspect_ratio_info);
+-        put_bits(&s->pb, 4, s->frame_rate_index);
+-
+-        if (s->avctx->rc_max_rate) {
+-            v = (s->avctx->rc_max_rate + 399) / 400;
 +#endif // MEANX
 +            // MEANX put_bits(&s->pb, 4, s->aspect_ratio_info);
 +            // MEANX put_bits(&s->pb, 4, s->frame_rate_index);
@@ -47,16 +51,10 @@
 +            if(s->avctx->rc_buffer_size_header) // MEANX we use header
 +            {
 +                vbv_buffer_size = s->avctx->rc_buffer_size_header;
- 
--        put_bits(&s->pb, 4, s->aspect_ratio_info);
--        put_bits(&s->pb, 4, s->frame_rate_index);
--
--        if (s->avctx->rc_max_rate) {
--            v = (s->avctx->rc_max_rate + 399) / 400;
              if (v > 0x3ffff && s->codec_id == AV_CODEC_ID_MPEG1VIDEO)
                  v = 0x3ffff;
          } else {
-@@ -324,7 +353,19 @@
+@@ -325,7 +355,19 @@
              put_bits(&s->pb, 3, s->avctx->profile); // profile
              put_bits(&s->pb, 4, s->avctx->level);   // level
  
@@ -77,7 +75,7 @@
              put_bits(&s->pb, 2, s->chroma_format);
              put_bits(&s->pb, 2, s->width  >> 12);
              put_bits(&s->pb, 2, s->height >> 12);
-@@ -425,6 +466,7 @@
+@@ -427,6 +469,7 @@
  
  void ff_mpeg1_encode_picture_header(MpegEncContext *s, int picture_number)
  {
@@ -85,7 +83,7 @@
      AVFrameSideData *side_data;
      mpeg1_encode_sequence_header(s);
  
-@@ -463,6 +505,46 @@
+@@ -465,6 +508,46 @@
  
      s->frame_pred_frame_dct = 1;
      if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
@@ -132,7 +130,7 @@
          put_header(s, EXT_START_CODE);
          put_bits(&s->pb, 4, 8);                 /* pic ext */
          if (s->pict_type == AV_PICTURE_TYPE_P ||
-@@ -482,10 +564,14 @@
+@@ -484,10 +567,14 @@
  
          av_assert0(s->picture_structure == PICT_FRAME);
          put_bits(&s->pb, 2, s->picture_structure);
@@ -147,7 +145,7 @@
          /* XXX: optimize the generation of this flag with entropy measures */
          s->frame_pred_frame_dct = s->progressive_sequence;
  
-@@ -494,7 +580,8 @@
+@@ -496,7 +583,8 @@
          put_bits(&s->pb, 1, s->q_scale_type);
          put_bits(&s->pb, 1, s->intra_vlc_format);
          put_bits(&s->pb, 1, s->alternate_scan);

libavcodec_mpegvideo_enc.c.patch Changed

@@ -1,12 +1,12 @@
---- libavcodec/mpegvideo_enc.c.orig	2015-06-10 20:53:04.066303738 +0200
-+++ libavcodec/mpegvideo_enc.c	2015-06-10 20:57:27.692337620 +0200
-@@ -469,14 +469,14 @@
+--- libavcodec/mpegvideo_enc.c.orig	2015-09-10 21:42:19.055613989 +0200
++++ libavcodec/mpegvideo_enc.c	2015-09-10 21:42:19.096613316 +0200
+@@ -498,14 +498,14 @@
                 "Warning vbv_delay will be set to 0xFFFF (=VBR) as the "
                 "specified vbv buffer is too large for the given bitrate!\n");
      }
 -
 +#if 0 // MEANX
-     if ((s->avctx->flags & CODEC_FLAG_4MV) && s->codec_id != AV_CODEC_ID_MPEG4 &&
+     if ((s->avctx->flags & AV_CODEC_FLAG_4MV) && s->codec_id != AV_CODEC_ID_MPEG4 &&
          s->codec_id != AV_CODEC_ID_H263 && s->codec_id != AV_CODEC_ID_H263P &&
          s->codec_id != AV_CODEC_ID_FLV1) {
          av_log(avctx, AV_LOG_ERROR, "4MV not supported by codec\n");
@@ -17,7 +17,7 @@
      if (s->obmc && s->avctx->mb_decision != FF_MB_DECISION_SIMPLE) {
          av_log(avctx, AV_LOG_ERROR,
                 "OBMC is only supported with simple mb decision\n");
-@@ -568,7 +568,7 @@
+@@ -597,7 +597,7 @@
          av_log(avctx, AV_LOG_ERROR, "interlacing not supported by codec\n");
          return -1;
      }
@@ -26,7 +26,7 @@
      // FIXME mpeg2 uses that too
      if (s->mpeg_quant && (   s->codec_id != AV_CODEC_ID_MPEG4
                            && s->codec_id != AV_CODEC_ID_MPEG2VIDEO)) {
-@@ -576,7 +576,7 @@
+@@ -605,7 +605,7 @@
                 "mpeg2 style quantization not supported by codec\n");
          return -1;
      }

libavcodec_nvenc.patch Added

@@ -0,0 +1,143 @@
+--- libavcodec/nvenc.c.orig	2015-09-10 16:03:16.151393593 +0200
++++ libavcodec/nvenc.c	2015-09-10 16:03:16.198393966 +0200
+@@ -960,19 +960,19 @@
+ 
+         switch (avctx->pix_fmt) {
+         case AV_PIX_FMT_YUV420P:
+-            allocSurf.bufferFmt = NV_ENC_BUFFER_FORMAT_YV12_PL;
+-            break;
++            //allocSurf.bufferFmt = NV_ENC_BUFFER_FORMAT_YV12_PL;
++            //break;
+ 
+         case AV_PIX_FMT_NV12:
+             allocSurf.bufferFmt = NV_ENC_BUFFER_FORMAT_NV12_PL;
+             break;
+ 
+-        case AV_PIX_FMT_YUV444P:
+-            allocSurf.bufferFmt = NV_ENC_BUFFER_FORMAT_YUV444_PL;
+-            break;
++        //case AV_PIX_FMT_YUV444P:
++            //allocSurf.bufferFmt = NV_ENC_BUFFER_FORMAT_YUV444_PL;
++            //break;
+ 
+         default:
+-            av_log(avctx, AV_LOG_FATAL, "Invalid input pixel format\n");
++            av_log(avctx, AV_LOG_FATAL, "NVENC: Invalid input pixel format\n");
+             res = AVERROR(EINVAL);
+             goto error;
+         }
+@@ -1198,6 +1198,28 @@
+ 
+     return res;
+ }
++/**
++        MEANX
++*/
++static void interleave_nv12(unsigned char *dest, int dest_stride,unsigned char *u,int u_stride,unsigned char *v,int v_stride,int width, int height)
++{
++        int x,y;
++        unsigned char *d;
++        unsigned char *pu;
++        unsigned char *pv;
++        for(y=0;y<height;y++)
++        {
++                d=dest;dest+=dest_stride;
++                pu=u;u+=u_stride;
++                pv=v;v+=v_stride;
++                for(x=0;x<width;x++)
++                {
++                        *(d++)=*(pu++);
++                        *(d++)=*(pv++);
++                }
++
++        }
++} 
+ 
+ static int nvenc_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
+     const AVFrame *frame, int *got_packet)
+@@ -1235,62 +1257,33 @@
+         if (nv_status != NV_ENC_SUCCESS) {
+             av_log(avctx, AV_LOG_ERROR, "Failed locking nvenc input buffer\n");
+             return 0;
+-        }
+-
+-        if (avctx->pix_fmt == AV_PIX_FMT_YUV420P) {
+-            uint8_t *buf = lockBufferParams.bufferDataPtr;
+-
+-            av_image_copy_plane(buf, lockBufferParams.pitch,
+-                frame->data[0], frame->linesize[0],
+-                avctx->width, avctx->height);
+-
+-            buf += inSurf->height * lockBufferParams.pitch;
+-
+-            av_image_copy_plane(buf, lockBufferParams.pitch >> 1,
+-                frame->data[2], frame->linesize[2],
+-                avctx->width >> 1, avctx->height >> 1);
+-
+-            buf += (inSurf->height * lockBufferParams.pitch) >> 2;
++        }  
++        { 
++        uint8_t *buf = lockBufferParams.bufferDataPtr;
+ 
+-            av_image_copy_plane(buf, lockBufferParams.pitch >> 1,
+-                frame->data[1], frame->linesize[1],
+-                avctx->width >> 1, avctx->height >> 1);
+-        } else if (avctx->pix_fmt == AV_PIX_FMT_NV12) {
+-            uint8_t *buf = lockBufferParams.bufferDataPtr;
+-
+-            av_image_copy_plane(buf, lockBufferParams.pitch,
++        av_image_copy_plane(buf, lockBufferParams.pitch,
+                 frame->data[0], frame->linesize[0],
+                 avctx->width, avctx->height);
++// MEANX : We accept YV12 and interleave while copying, it saves us one intermediate image buffer
++        buf += inSurf->height * lockBufferParams.pitch;
++        switch(avctx->pix_fmt)
++        {
++                case AV_PIX_FMT_YUV420P:
++                        // Interleave U & V to NV12
++                        interleave_nv12(buf, lockBufferParams.pitch,frame->data[1],frame->linesize[1],frame->data[2],frame->linesize[2],avctx->width>>1, avctx->height>>1); 
++                        break;
++
++                case AV_PIX_FMT_NV12:
++                        av_image_copy_plane(buf, lockBufferParams.pitch,
++                                frame->data[1], frame->linesize[1],
++                                avctx->width, avctx->height >> 1);
++                        break;
++                default:
++                        av_log(avctx, AV_LOG_FATAL, "NVENC: Invalid pixel format!\n");
++                        return AVERROR(EINVAL);
+ 
+-            buf += inSurf->height * lockBufferParams.pitch;
+-
+-            av_image_copy_plane(buf, lockBufferParams.pitch,
+-                frame->data[1], frame->linesize[1],
+-                avctx->width, avctx->height >> 1);
+-        } else if (avctx->pix_fmt == AV_PIX_FMT_YUV444P) {
+-            uint8_t *buf = lockBufferParams.bufferDataPtr;
+-
+-            av_image_copy_plane(buf, lockBufferParams.pitch,
+-                frame->data[0], frame->linesize[0],
+-                avctx->width, avctx->height);
+-
+-            buf += inSurf->height * lockBufferParams.pitch;
+-
+-            av_image_copy_plane(buf, lockBufferParams.pitch,
+-                frame->data[1], frame->linesize[1],
+-                avctx->width, avctx->height);
+-
+-            buf += inSurf->height * lockBufferParams.pitch;
+-
+-            av_image_copy_plane(buf, lockBufferParams.pitch,
+-                frame->data[2], frame->linesize[2],
+-                avctx->width, avctx->height);
+-        } else {
+-            av_log(avctx, AV_LOG_FATAL, "Invalid pixel format!\n");
+-            return AVERROR(EINVAL);
+-        }
+-
+-        nv_status = p_nvenc->nvEncUnlockInputBuffer(ctx->nvencoder, inSurf->input_surface);
++       }
++       nv_status = p_nvenc->nvEncUnlockInputBuffer(ctx->nvencoder, inSurf->input_surface);
+         if (nv_status != NV_ENC_SUCCESS) {
+             av_log(avctx, AV_LOG_FATAL, "Failed unlocking input buffer!\n");
+             return AVERROR_EXTERNAL;

ffmpeg-2.7.2.tar.bz2 -> ffmpeg-2.8.tar.bz2 Changed

Changes of Revision 19