Pass VBV delay to the calling application via ctx

VBV delay is useful for T-STD compliance in some TS muxers. It is certainly possible to retrieve it by parsing the output of FFmpeg, but getting it from the context makes it simpler and less error-prone.

Christophe Massiot committed 15 years ago

Commit 55bad0c1 parent 71f88b12 files · +10 −1Browse files

Unified · Split

2 files

libavcodec/avcodec.h +9 −1
libavcodec/mpegvideo_enc.c +1 −0

libavcodec/avcodec.h+9−1

 #include "libavutil/cpu.h"
 #define LIBAVCODEC_VERSION_MAJOR 52
-#define LIBAVCODEC_VERSION_MINOR 112
+#define LIBAVCODEC_VERSION_MINOR 113
 #define LIBAVCODEC_VERSION_MICRO  1
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
      * - decoding: Set by user.
      */
     int thread_safe_callbacks;
+    /**
+     * VBV delay coded in the last frame (in periods of a 27 MHz clock).
+     * Used for compliant TS muxing.
+     * - encoding: Set by libavcodec.
+     * - decoding: unused.
+     */
+    uint64_t vbv_delay;
 } AVCodecContext;
 /**

libavcodec/mpegvideo_enc.c+1−0

@@ -1381,6 +1381,7 @@ vbv_retry: · 1380 unmodified lines
1381	s->vbv_delay_ptr[1] = vbv_delay>>5;	1381	s->vbv_delay_ptr[1] = vbv_delay>>5;
1382	s->vbv_delay_ptr[2] &= 0x07;	1382	s->vbv_delay_ptr[2] &= 0x07;
1383	s->vbv_delay_ptr[2] \|= vbv_delay<<3;	1383	s->vbv_delay_ptr[2] \|= vbv_delay<<3;
		1384	avctx->vbv_delay = vbv_delay*300;
1384	}	1385	}
1385	s->total_bits += s->frame_bits;	1386	s->total_bits += s->frame_bits;
1386	avctx->frame_bits = s->frame_bits;	1387	avctx->frame_bits = s->frame_bits;

Pass VBV delay to the calling application via ctx

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code