History

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 b6d07001 parent c4c9fb42 files · +10 −1Browse files

Unified · Split

2 files
  1. libavcodec/avcodec.h +9 −1
  2. libavcodec/mpegvideo_enc.c +1 −0
libavcodec/avcodec.h+9−1
@@ -32,7 +32,7 @@ · 31 unmodified lines
32#include "libavutil/cpu.h"32#include "libavutil/cpu.h"
33 33
34#define LIBAVCODEC_VERSION_MAJOR 5234#define LIBAVCODEC_VERSION_MAJOR 52
35#define LIBAVCODEC_VERSION_MINOR 11235#define LIBAVCODEC_VERSION_MINOR 113
36#define LIBAVCODEC_VERSION_MICRO 136#define LIBAVCODEC_VERSION_MICRO 1
37 37
38#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \38#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
@@ -2901,6 +2901,14 @@ typedef struct AVCodecContext { · 2862 unmodified lines
2901 */2901 */
2902 int thread_safe_callbacks;2902 int thread_safe_callbacks;
2903 2903
2904 /**
2905 * VBV delay coded in the last frame (in periods of a 27 MHz clock).
2906 * Used for compliant TS muxing.
2907 * - encoding: Set by libavcodec.
2908 * - decoding: unused.
2909 */
2910 uint64_t vbv_delay;
2911
2904 /**2912 /**
2905 * Current statistics for PTS correction.2913 * Current statistics for PTS correction.
2906 * - decoding: maintained and used by libavcodec, not intended to be used by user apps2914 * - decoding: maintained and used by libavcodec, not intended to be used by user apps
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;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t