--
Mats Peterson
http://matsp888.no-ip.org/~mats/
>From 7b903e8b0c35f72e2b2530a298719a617a3c1ec8 Mon Sep 17 00:00:00 2001
From: Mats Peterson <matsp...@yahoo.com>
Date: Mon, 29 Feb 2016 07:36:01 +0100
Subject: [PATCH 2/4] lavf/movenc: Add support for palette side data packets
---
libavformat/movenc.c | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 3295266..09ada1e 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -1717,12 +1717,13 @@ static int mov_write_video_tag(AVIOContext *pb, MOVMuxContext *mov, MOVTrack *tr
avio_wb16(pb, 0x18); /* Reserved */
if (track->is_unaligned_qt_rgb && track->enc->pix_fmt == AV_PIX_FMT_PAL8) {
+ int pal_size = 1 << track->enc->bits_per_coded_sample;
int i;
avio_wb16(pb, 0); /* Color table ID */
avio_wb32(pb, 0); /* Color table seed */
avio_wb16(pb, 0x8000); /* Color table flags */
- avio_wb16(pb, 255); /* Color table size (zero-relative) */
- for (i = 0; i < 256; i++) {
+ avio_wb16(pb, pal_size - 1); /* Color table size (zero-relative) */
+ for (i = 0; i < pal_size; i++) {
uint32_t rgb = AV_RL32(&track->palette[i]);
uint16_t r = (rgb >> 16) & 0xff;
uint16_t g = (rgb >> 8) & 0xff;
@@ -4763,19 +4764,22 @@ static int mov_write_packet(AVFormatContext *s, AVPacket *pkt)
}
}
- if (trk->is_unaligned_qt_rgb) {
- const uint8_t *data = pkt->data;
- int size = pkt->size;
+ if (trk->is_unaligned_qt_rgb && 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;
+ AVPacket *opkt = pkt;
int ret = ff_reshuffle_raw_rgb(s, &pkt, trk->enc, expected_stride);
if (ret < 0)
return ret;
- if (ret == CONTAINS_PAL && !trk->pal_done) {
- int pal_size = 1 << trk->enc->bits_per_coded_sample;
- memset(trk->palette, 0, AVPALETTE_SIZE);
- memcpy(trk->palette, data + size - 4*pal_size, 4*pal_size);
- trk->pal_done++;
+ if (!trk->pal_done) {
+ const uint8_t *pal;
+ int ret2 = ff_get_raw_palette(s, opkt, ret, &pal);
+ if (ret2 < 0)
+ return ret2;
+ if (pal) {
+ memcpy(trk->palette, pal, AVPALETTE_SIZE);
+ trk->pal_done++;
+ }
} else if (trk->enc->pix_fmt == AV_PIX_FMT_GRAY8 ||
trk->enc->pix_fmt == AV_PIX_FMT_MONOBLACK) {
for (i = 0; i < pkt->size; i++)
--
1.7.10.4
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
