Moved the new stuff in MOVMuxContext in movenc.h to the bottom of the
structure.
--
Mats Peterson
http://matsp888.no-ip.org/~mats/
>From c42d9c22a3b3ecd962c756d256c11fcde82a970a Mon Sep 17 00:00:00 2001
From: Mats Peterson <matsp...@yahoo.com>
Date: Sun, 21 Feb 2016 11:27:34 +0100
Subject: [PATCH v6] lavf/movenc: Add palette to video sample description
---
libavformat/movenc.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++-
libavformat/movenc.h | 5 +++++
2 files changed, 64 insertions(+), 1 deletion(-)
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index b9c0f7a..34e85b3 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -1714,7 +1714,29 @@ static int mov_write_video_tag(AVIOContext *pb, MOVMuxContext *mov, MOVTrack *tr
avio_wb16(pb, track->enc->bits_per_coded_sample);
else
avio_wb16(pb, 0x18); /* Reserved */
- avio_wb16(pb, 0xffff); /* Reserved */
+
+ if (track->enc->codec_id == AV_CODEC_ID_RAWVIDEO && mov->is_raw_rgb &&
+ track->enc->bits_per_coded_sample >= 1 && track->enc->bits_per_coded_sample <= 8) {
+ int i;
+ int pal_size = 1 << track->enc->bits_per_coded_sample;
+ avio_wb16(pb, 0); /* Color table ID */
+ avio_wb32(pb, 0); /* Color table seed */
+ avio_wb16(pb, 0x8000); /* Color table flags */
+ avio_wb16(pb, pal_size - 1); /* Color table size (zero-relative) */
+ for (i = 0; i < pal_size; i++) {
+ uint32_t v = mov->palette[i];
+ uint32_t r, g, b;
+ avio_wb16(pb, 0);
+ r = (v >> 16) & 0xff;
+ avio_wb16(pb, (r << 8) | r);
+ g = (v >> 8) & 0xff;
+ avio_wb16(pb, (g << 8) | g);
+ b = v & 0xff;
+ avio_wb16(pb, (b << 8) | b);
+ }
+ } else
+ avio_wb16(pb, 0xffff); /* Color table ID, -1 for no or default palette */
+
if (track->tag == MKTAG('m','p','4','v'))
mov_write_esds_tag(pb, track);
else if (track->enc->codec_id == AV_CODEC_ID_H263)
@@ -4703,6 +4725,7 @@ static int mov_write_packet(AVFormatContext *s, AVPacket *pkt)
} else {
int i;
MOVMuxContext *mov = s->priv_data;
+ MOVTrack *trk = &mov->tracks[pkt->stream_index];
if (!pkt->size)
return mov_write_single_packet(s, pkt); /* Passthrough. */
@@ -4739,6 +4762,41 @@ static int mov_write_packet(AVFormatContext *s, AVPacket *pkt)
}
}
+ mov->is_raw_rgb = trk->enc->pix_fmt == AV_PIX_FMT_RGB24 ||
+ trk->enc->pix_fmt == AV_PIX_FMT_ARGB ||
+ trk->enc->pix_fmt == AV_PIX_FMT_RGB555BE ||
+ trk->enc->pix_fmt == AV_PIX_FMT_PAL8 ||
+ trk->enc->pix_fmt == AV_PIX_FMT_MONOWHITE ||
+ trk->enc->pix_fmt == AV_PIX_FMT_MONOBLACK;
+
+ if (trk->enc->codec_id == AV_CODEC_ID_RAWVIDEO && mov->is_raw_rgb) {
+ const uint8_t *data = pkt->data;
+ int size = pkt->size;
+ int64_t bpc = trk->enc->bits_per_coded_sample != 15 ? trk->enc->bits_per_coded_sample : 16;
+ int expected_stride = ((trk->enc->width * bpc + 15) >> 4)*2;
+ int ret = ff_reshuffle_raw_rgb(s, &pkt, trk->enc, expected_stride);
+ if (ret < 0)
+ return ret;
+ if (!mov->pal_done) {
+ if (ret == CONTAINS_PAL) {
+ int pal_size = 1 << trk->enc->bits_per_coded_sample;
+ memcpy(mov->palette, data + size - 4*pal_size, 4*pal_size);
+ } else if (trk->enc->bits_per_coded_sample == 1) {
+ /* Initialize 1 bpp palette to black & white */
+ if (trk->enc->pix_fmt == AV_PIX_FMT_MONOBLACK)
+ mov->palette[1] = 0xffffffff;
+ else
+ mov->palette[0] = 0xffffffff;
+ }
+ mov->pal_done++;
+ }
+ if (ret) {
+ ret = mov_write_single_packet(s, pkt);
+ av_packet_free(&pkt);
+ return ret;
+ }
+ }
+
return mov_write_single_packet(s, pkt);
}
}
diff --git a/libavformat/movenc.h b/libavformat/movenc.h
index deb90fe..d2499bd 100644
--- a/libavformat/movenc.h
+++ b/libavformat/movenc.h
@@ -209,6 +209,11 @@ typedef struct MOVMuxContext {
uint8_t *encryption_kid;
int encryption_kid_len;
+ uint32_t palette[AVPALETTE_SIZE / 4];
+ int pal_done;
+
+ int is_raw_rgb;
+
} MOVMuxContext;
#define FF_MOV_FLAG_RTP_HINT (1 << 0)
--
1.7.10.4
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
