#include "libavutil/avstring.h"
#include "libavutil/avutil.h"
#include "libavutil/internal.h"
-#include "libavutil/intreadwrite.h"
#include "libavutil/dict.h"
#include "libavutil/avassert.h"
#include "libavutil/timestamp.h"
typedef struct AVIContext {
const AVClass *class;
+ AVPacket *empty_packet;
int64_t riff_start, movi_list, odml_list;
int64_t frames_hdr_all;
int riff_id;
int reserve_index_space;
int master_index_max_size;
int write_channel_mask;
+ int flipped_raw_rgb;
} AVIContext;
typedef struct AVIStream {
int padding;
if (s->nb_streams > AVI_MAX_STREAM_COUNT) {
- av_log(s, AV_LOG_ERROR, "AVI does not support >%d streams\n",
- AVI_MAX_STREAM_COUNT);
+ av_log(s, AV_LOG_ERROR, "AVI does not support "
+ ">"AV_STRINGIFY(AVI_MAX_STREAM_COUNT)" streams\n");
return AVERROR(EINVAL);
}
+ avi->empty_packet = av_packet_alloc();
+ if (!avi->empty_packet)
+ return AVERROR(ENOMEM);
+
for (n = 0; n < s->nb_streams; n++) {
s->streams[n]->priv_data = av_mallocz(sizeof(AVIStream));
if (!s->streams[n]->priv_data)
&& par->bits_per_coded_sample == 15)
par->bits_per_coded_sample = 16;
avist->pal_offset = avio_tell(pb) + 40;
- ff_put_bmp_header(pb, par, 0, 0);
+ ff_put_bmp_header(pb, par, 0, 0, avi->flipped_raw_rgb);
pix_fmt = avpriv_find_pix_fmt(avpriv_pix_fmt_bps_avi,
par->bits_per_coded_sample);
if ( !par->codec_tag
&& par->format != AV_PIX_FMT_NONE)
av_log(s, AV_LOG_ERROR, "%s rawvideo cannot be written to avi, output file will be unreadable\n",
av_get_pix_fmt_name(par->format));
+
+ if (par->format == AV_PIX_FMT_PAL8) {
+ if (par->bits_per_coded_sample < 0 || par->bits_per_coded_sample > 8) {
+ av_log(s, AV_LOG_ERROR, "PAL8 with %d bps is not allowed\n", par->bits_per_coded_sample);
+ return AVERROR(EINVAL);
+ }
+ }
+
break;
case AVMEDIA_TYPE_AUDIO:
flags = (avi->write_channel_mask == 0) ? FF_PUT_WAV_HEADER_SKIP_CHANNELMASK : 0;
avi->movi_list = ff_start_tag(pb, "LIST");
ffio_wfourcc(pb, "movi");
- avio_flush(pb);
-
return 0;
}
int64_t pos;
int au_byterate, au_ssize, au_scale;
- avio_flush(pb);
pos = avio_tell(pb);
/* Updating one entry in the AVI OpenDML master index */
static int write_skip_frames(AVFormatContext *s, int stream_index, int64_t dts)
{
+ AVIContext *avi = s->priv_data;
AVIStream *avist = s->streams[stream_index]->priv_data;
AVCodecParameters *par = s->streams[stream_index]->codecpar;
ff_dlog(s, "dts:%s packet_count:%d stream_index:%d\n", av_ts2str(dts), avist->packet_count, stream_index);
while (par->block_align == 0 && dts != AV_NOPTS_VALUE &&
dts > avist->packet_count && par->codec_id != AV_CODEC_ID_XSUB && avist->packet_count) {
- AVPacket empty_packet;
if (dts - avist->packet_count > 60000) {
av_log(s, AV_LOG_ERROR, "Too large number of skipped frames %"PRId64" > 60000\n", dts - avist->packet_count);
return AVERROR(EINVAL);
}
- av_init_packet(&empty_packet);
- empty_packet.size = 0;
- empty_packet.data = NULL;
- empty_packet.stream_index = stream_index;
- avi_write_packet_internal(s, &empty_packet);
+ avi->empty_packet->stream_index = stream_index;
+ avi_write_packet_internal(s, avi->empty_packet);
ff_dlog(s, "dup dts:%s packet_count:%d\n", av_ts2str(dts), avist->packet_count);
}
AVIContext *avi = s->priv_data;
AVIOContext *pb = s->pb;
int res = 0;
- int i, j, n, nb_frames;
+ int i, n, nb_frames;
int64_t file_size;
for (i = 0; i < s->nb_streams; i++) {
for (i = 0; i < s->nb_streams; i++) {
AVIStream *avist = s->streams[i]->priv_data;
- for (j = 0; j < avist->indexes.ents_allocated / AVI_INDEX_CLUSTER_SIZE; j++)
- av_freep(&avist->indexes.cluster[j]);
- av_freep(&avist->indexes.cluster);
- avist->indexes.ents_allocated = avist->indexes.entry = 0;
if (pb->seekable & AVIO_SEEKABLE_NORMAL) {
avio_seek(pb, avist->frames_hdr_strm + 4, SEEK_SET);
avio_wl32(pb, avist->max_size);
return res;
}
+static void avi_deinit(AVFormatContext *s)
+{
+ AVIContext *avi = s->priv_data;
+
+ av_packet_free(&avi->empty_packet);
+
+ for (int i = 0; i < s->nb_streams; i++) {
+ AVIStream *avist = s->streams[i]->priv_data;
+ if (!avist)
+ continue;
+ for (int j = 0; j < avist->indexes.ents_allocated / AVI_INDEX_CLUSTER_SIZE; j++)
+ av_freep(&avist->indexes.cluster[j]);
+ av_freep(&avist->indexes.cluster);
+ avist->indexes.ents_allocated = avist->indexes.entry = 0;
+ }
+}
+
#define OFFSET(x) offsetof(AVIContext, x)
#define ENC AV_OPT_FLAG_ENCODING_PARAM
static const AVOption options[] = {
{ "reserve_index_space", "reserve space (in bytes) at the beginning of the file for each stream index", OFFSET(reserve_index_space), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, ENC },
{ "write_channel_mask", "write channel mask into wave format header", OFFSET(write_channel_mask), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, ENC },
+ { "flipped_raw_rgb", "Raw RGB bitmaps are stored bottom-up", OFFSET(flipped_raw_rgb), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, ENC },
{ NULL },
};
.audio_codec = CONFIG_LIBMP3LAME ? AV_CODEC_ID_MP3 : AV_CODEC_ID_AC3,
.video_codec = AV_CODEC_ID_MPEG4,
.init = avi_init,
+ .deinit = avi_deinit,
.write_header = avi_write_header,
.write_packet = avi_write_packet,
.write_trailer = avi_write_trailer,
- .codec_tag = (const AVCodecTag * const []) {
- ff_codec_bmp_tags, ff_codec_wav_tags, 0
- },
+ .codec_tag = ff_riff_codec_tags_list,
.priv_class = &avi_muxer_class,
};
projects / ffmpeg / blobdiff