MrBesen
/
ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/mpegenc: Simplify writing padding/stuffing 

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2021-09-22 21:58:33 +02:00
parent 62c8b96a13
commit dbc76e4e70
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libavformat/mpegenc.c
View File

@ -30,6 +30,7 @@
#include "libavcodec/put_bits.h" #include "libavcodec/put_bits.h"
#include "avformat.h" #include "avformat.h"
#include "avio_internal.h"
#include "internal.h" #include "internal.h"
#include "mpeg.h" #include "mpeg.h"
@ -598,7 +599,6 @@ static void put_padding_packet(AVFormatContext *ctx, AVIOContext *pb,
int packet_bytes) int packet_bytes)
{ {
MpegMuxContext *s = ctx->priv_data; MpegMuxContext *s = ctx->priv_data;
int i;
avio_wb32(pb, PADDING_STREAM); avio_wb32(pb, PADDING_STREAM);
avio_wb16(pb, packet_bytes - 6); avio_wb16(pb, packet_bytes - 6);
@ -608,8 +608,7 @@ static void put_padding_packet(AVFormatContext *ctx, AVIOContext *pb,
} else } else
packet_bytes -= 6; packet_bytes -= 6;
for (i = 0; i < packet_bytes; i++) ffio_fill(pb, 0xff, packet_bytes);
avio_w8(pb, 0xff);
} }
static int get_nb_frames(AVFormatContext *ctx, StreamInfo *stream, int len) static int get_nb_frames(AVFormatContext *ctx, StreamInfo *stream, int len)
@ -634,7 +633,7 @@ static int flush_packet(AVFormatContext *ctx, int stream_index,
MpegMuxContext *s = ctx->priv_data; MpegMuxContext *s = ctx->priv_data;
StreamInfo *stream = ctx->streams[stream_index]->priv_data; StreamInfo *stream = ctx->streams[stream_index]->priv_data;
uint8_t *buf_ptr; uint8_t *buf_ptr;
int size, payload_size, startcode, id, stuffing_size, i, header_len; int size, payload_size, startcode, id, stuffing_size, header_len;
int packet_size; int packet_size;
uint8_t buffer[128]; uint8_t buffer[128];
int zero_trail_bytes = 0; int zero_trail_bytes = 0;
@ -685,14 +684,12 @@ static int flush_packet(AVFormatContext *ctx, int stream_index,
avio_wb32(ctx->pb, PRIVATE_STREAM_2); avio_wb32(ctx->pb, PRIVATE_STREAM_2);
avio_wb16(ctx->pb, 0x03d4); // length avio_wb16(ctx->pb, 0x03d4); // length
avio_w8(ctx->pb, 0x00); // substream ID, 00=PCI avio_w8(ctx->pb, 0x00); // substream ID, 00=PCI
for (i = 0; i < 979; i++) ffio_fill(ctx->pb, 0x00, 979);
avio_w8(ctx->pb, 0x00);
avio_wb32(ctx->pb, PRIVATE_STREAM_2); avio_wb32(ctx->pb, PRIVATE_STREAM_2);
avio_wb16(ctx->pb, 0x03fa); // length avio_wb16(ctx->pb, 0x03fa); // length
avio_w8(ctx->pb, 0x01); // substream ID, 01=DSI avio_w8(ctx->pb, 0x01); // substream ID, 01=DSI
for (i = 0; i < 1017; i++) ffio_fill(ctx->pb, 0x00, 1017);
avio_w8(ctx->pb, 0x00);
memset(buffer, 0, 128); memset(buffer, 0, 128);
buf_ptr = buffer; buf_ptr = buffer;
@ -835,8 +832,7 @@ static int flush_packet(AVFormatContext *ctx, int stream_index,
avio_wb16(ctx->pb, packet_size); avio_wb16(ctx->pb, packet_size);
if (!s->is_mpeg2) if (!s->is_mpeg2)
for (i = 0; i < stuffing_size; i++) ffio_fill(ctx->pb, 0xff, stuffing_size);
avio_w8(ctx->pb, 0xff);
if (s->is_mpeg2) { if (s->is_mpeg2) {
avio_w8(ctx->pb, 0x80); /* mpeg2 id */ avio_w8(ctx->pb, 0x80); /* mpeg2 id */
@ -891,8 +887,7 @@ static int flush_packet(AVFormatContext *ctx, int stream_index,
* to prevent accidental generation of start codes. */ * to prevent accidental generation of start codes. */
avio_w8(ctx->pb, 0xff); avio_w8(ctx->pb, 0xff);
for (i = 0; i < stuffing_size; i++) ffio_fill(ctx->pb, 0xff, stuffing_size);
avio_w8(ctx->pb, 0xff);
} }
if (startcode == PRIVATE_STREAM_1) { if (startcode == PRIVATE_STREAM_1) {
@ -925,8 +920,7 @@ static int flush_packet(AVFormatContext *ctx, int stream_index,
if (pad_packet_bytes > 0) if (pad_packet_bytes > 0)
put_padding_packet(ctx, ctx->pb, pad_packet_bytes); put_padding_packet(ctx, ctx->pb, pad_packet_bytes);
for (i = 0; i < zero_trail_bytes; i++) ffio_fill(ctx->pb, 0x00, zero_trail_bytes);
avio_w8(ctx->pb, 0x00);
avio_write_marker(ctx->pb, AV_NOPTS_VALUE, AVIO_DATA_MARKER_FLUSH_POINT); avio_write_marker(ctx->pb, AV_NOPTS_VALUE, AVIO_DATA_MARKER_FLUSH_POINT);
@ -950,10 +944,8 @@ static void put_vcd_padding_sector(AVFormatContext *ctx)
* So a 0-sector it is... */ * So a 0-sector it is... */
MpegMuxContext *s = ctx->priv_data; MpegMuxContext *s = ctx->priv_data;
int i;
for (i = 0; i < s->packet_size; i++) ffio_fill(ctx->pb, 0, s->packet_size);
avio_w8(ctx->pb, 0);
s->vcd_padding_bytes_written += s->packet_size; s->vcd_padding_bytes_written += s->packet_size;