virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

astenc: Enable the loop flag only when needed

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
James Almer
2013-01-05 12:39:42 -03:00
committed by Michael Niedermayer
parent 9a697cfe71
commit b7d77f8e64
2 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
libavformat/astenc.c
View File

@@ -36,7 +36,7 @@ typedef struct ASTMuxContext {
} ASTMuxContext; } ASTMuxContext;
#define CHECK_LOOP(type) \ #define CHECK_LOOP(type) \
if (ast->loop ## type) { \ if (ast->loop ## type > 0) { \
ast->loop ## type = av_rescale_rnd(ast->loop ## type, enc->sample_rate, 1000, AV_ROUND_DOWN); \ ast->loop ## type = av_rescale_rnd(ast->loop ## type, enc->sample_rate, 1000, AV_ROUND_DOWN); \
if (ast->loop ## type < 0 || ast->loop ## type > UINT_MAX) { \ if (ast->loop ## type < 0 || ast->loop ## type > UINT_MAX) { \
av_log(s, AV_LOG_ERROR, "Invalid loop" #type " value\n"); \ av_log(s, AV_LOG_ERROR, "Invalid loop" #type " value\n"); \
@@ -69,7 +69,7 @@ static int ast_write_header(AVFormatContext *s)
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
if (ast->loopstart && ast->loopend && ast->loopstart >= ast->loopend) { if (ast->loopend > 0 && ast->loopstart >= ast->loopend) {
av_log(s, AV_LOG_ERROR, "loopend can't be less or equal to loopstart\n"); av_log(s, AV_LOG_ERROR, "loopend can't be less or equal to loopstart\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
@@ -85,7 +85,7 @@ static int ast_write_header(AVFormatContext *s)
avio_wb16(pb, codec_tag); avio_wb16(pb, codec_tag);
avio_wb16(pb, 16); /* Bit depth */ avio_wb16(pb, 16); /* Bit depth */
avio_wb16(pb, enc->channels); avio_wb16(pb, enc->channels);
avio_wb16(pb, 0xFFFF); avio_wb16(pb, 0); /* Loop flag */
avio_wb32(pb, enc->sample_rate); avio_wb32(pb, enc->sample_rate);
ast->samples = avio_tell(pb); ast->samples = avio_tell(pb);
@@ -140,23 +140,23 @@ static int ast_write_trailer(AVFormatContext *s)
av_log(s, AV_LOG_DEBUG, "total samples: %"PRId64"\n", samples); av_log(s, AV_LOG_DEBUG, "total samples: %"PRId64"\n", samples);
if (s->pb->seekable) { if (s->pb->seekable) {
/* File size minus header */
avio_seek(pb, ast->size, SEEK_SET);
avio_wb32(pb, file_size - 64);
/* Number of samples */ /* Number of samples */
avio_seek(pb, ast->samples, SEEK_SET); avio_seek(pb, ast->samples, SEEK_SET);
avio_wb32(pb, samples); avio_wb32(pb, samples);
/* Loopstart if provided */ /* Loopstart if provided */
if (ast->loopstart && ast->loopstart >= samples) { if (ast->loopstart > 0) {
if (ast->loopstart >= samples) {
av_log(s, AV_LOG_WARNING, "Loopstart value is out of range and will be ignored\n"); av_log(s, AV_LOG_WARNING, "Loopstart value is out of range and will be ignored\n");
ast->loopstart = 0; ast->loopstart = -1;
} avio_skip(pb, 4);
} else
avio_wb32(pb, ast->loopstart); avio_wb32(pb, ast->loopstart);
} else
avio_skip(pb, 4);
/* Loopend if provided. Otherwise number of samples again */ /* Loopend if provided. Otherwise number of samples again */
if (ast->loopend) { if (ast->loopend && ast->loopstart >= 0) {
if (ast->loopend > samples) { if (ast->loopend > samples) {
av_log(s, AV_LOG_WARNING, "Loopend value is out of range and will be ignored\n"); av_log(s, AV_LOG_WARNING, "Loopend value is out of range and will be ignored\n");
ast->loopend = samples; ast->loopend = samples;
@@ -168,6 +168,18 @@ static int ast_write_trailer(AVFormatContext *s)
/* Size of first block */ /* Size of first block */
avio_wb32(pb, ast->fbs); avio_wb32(pb, ast->fbs);
/* File size minus header */
avio_seek(pb, ast->size, SEEK_SET);
avio_wb32(pb, file_size - 64);
/* Loop flag */
if (ast->loopstart >= 0) {
avio_skip(pb, 6);
avio_wb16(pb, 0xFFFF);
}
avio_seek(pb, file_size, SEEK_SET);
avio_flush(pb); avio_flush(pb);
} }
return 0; return 0;
@@ -175,7 +187,7 @@ static int ast_write_trailer(AVFormatContext *s)
#define OFFSET(obj) offsetof(ASTMuxContext, obj) #define OFFSET(obj) offsetof(ASTMuxContext, obj)
static const AVOption options[] = { static const AVOption options[] = {
{ "loopstart", "Loopstart position in milliseconds.", OFFSET(loopstart), AV_OPT_TYPE_INT64, { .i64 = 0 }, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM }, { "loopstart", "Loopstart position in milliseconds.", OFFSET(loopstart), AV_OPT_TYPE_INT64, { .i64 = -1 }, -1, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM },
{ "loopend", "Loopend position in milliseconds.", OFFSET(loopend), AV_OPT_TYPE_INT64, { .i64 = 0 }, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM }, { "loopend", "Loopend position in milliseconds.", OFFSET(loopend), AV_OPT_TYPE_INT64, { .i64 = 0 }, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM },
{ NULL }, { NULL },
}; };

2
libavformat/version.h
View File

@@ -31,7 +31,7 @@
#define LIBAVFORMAT_VERSION_MAJOR 54 #define LIBAVFORMAT_VERSION_MAJOR 54
#define LIBAVFORMAT_VERSION_MINOR 59 #define LIBAVFORMAT_VERSION_MINOR 59
#define LIBAVFORMAT_VERSION_MICRO 103 #define LIBAVFORMAT_VERSION_MICRO 104
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \ LIBAVFORMAT_VERSION_MINOR, \