[FFmpeg-devel] [PATCH 1/4] mm: set audio pts proportionally to audio offset

[FFmpeg-devel] [PATCH 1/4] mm: set audio pts proportionally to audio offset

[Peter Ross]

---
 libavformat/mm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavformat/mm.c b/libavformat/mm.c
index 23c025d852..a40b5c44bb 100644
--- a/libavformat/mm.c
+++ b/libavformat/mm.c
@@ -180,7 +180,8 @@ static int read_packet(AVFormatContext *s,
             if ((ret = av_get_packet(s->pb, pkt, length)) < 0)
                 return ret;
             pkt->stream_index = 1;
-            pkt->pts = mm->audio_pts++;
+            pkt->pts = mm->audio_pts;
+            mm->audio_pts += length;
             return 0;
 
         default :
-- 
2.43.0

-- Peter
(A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 2/4] mm: decode partial palette

[Peter Ross]

---
palette decoding now conforms to description at https://wiki.multimedia.cx/index.php/IBM_PhotoMotion

 libavcodec/mmvideo.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/libavcodec/mmvideo.c b/libavcodec/mmvideo.c
index 3038d9ea92..b5b6ffd25b 100644
--- a/libavcodec/mmvideo.c
+++ b/libavcodec/mmvideo.c
@@ -79,12 +79,10 @@ static av_cold int mm_decode_init(AVCodecContext *avctx)
 static void mm_decode_pal(MmContext *s)
 {
     int i;
-
-    bytestream2_skip(&s->gb, 4);
-    for (i = 0; i < 128; i++) {
-        s->palette[i] = 0xFFU << 24 | bytestream2_get_be24(&s->gb);
-        s->palette[i+128] = s->palette[i]<<2;
-    }
+    int start = bytestream2_get_le16(&s->gb);
+    int count = bytestream2_get_le16(&s->gb);
+    for (i = 0; i < count; i++)
+        s->palette[start+i] = 0xFFU << 24 | (bytestream2_get_be24(&s->gb) << 2);
 }
 
 /**
-- 
2.43.0

-- Peter
(A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 3/4] mm: don't fail if x offset exceeds frame width

[Peter Ross]

---
 libavcodec/mmvideo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/mmvideo.c b/libavcodec/mmvideo.c
index b5b6ffd25b..3b6b9ed580 100644
--- a/libavcodec/mmvideo.c
+++ b/libavcodec/mmvideo.c
@@ -162,7 +162,7 @@ static int mm_decode_inter(MmContext * s, int half_horiz, int half_vert)
             for(j=0; j<8; j++) {
                 int replace = (replace_array >> (7-j)) & 1;
                 if (x + half_horiz >= s->avctx->width)
-                    return AVERROR_INVALIDDATA;
+                    break;
                 if (replace) {
                     int color = bytestream2_get_byte(&data_ptr);
                     s->frame->data[0][y*s->frame->linesize[0] + x] = color;
-- 
2.43.0

-- Peter
(A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 4/4] mm: decode raw chunk type and skip unknown audio chunk type

[Peter Ross]

---
 libavcodec/mmvideo.c | 11 +++++++++++
 libavformat/mm.c     |  9 +++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/libavcodec/mmvideo.c b/libavcodec/mmvideo.c
index 3b6b9ed580..2d006d58ba 100644
--- a/libavcodec/mmvideo.c
+++ b/libavcodec/mmvideo.c
@@ -39,6 +39,7 @@
 
 #define MM_PREAMBLE_SIZE    6
 
+#define MM_TYPE_RAW         0x2
 #define MM_TYPE_INTER       0x5
 #define MM_TYPE_INTRA       0x8
 #define MM_TYPE_INTRA_HH    0xc
@@ -76,6 +77,15 @@ static av_cold int mm_decode_init(AVCodecContext *avctx)
     return 0;
 }
 
+static int mm_decode_raw(MmContext * s)
+{
+    if (bytestream2_get_bytes_left(&s->gb) < s->avctx->width * s->avctx->height)
+        return AVERROR_INVALIDDATA;
+    for (int y = 0; y < s->avctx->height; y++)
+        bytestream2_get_buffer(&s->gb, s->frame->data[0] + y*s->frame->linesize[0], s->avctx->width);
+    return 0;
+}
+
 static void mm_decode_pal(MmContext *s)
 {
     int i;
@@ -203,6 +213,7 @@ static int mm_decode_frame(AVCodecContext *avctx, AVFrame *rframe,
         return res;
 
     switch(type) {
+    case MM_TYPE_RAW       : res = mm_decode_raw(s); break;
     case MM_TYPE_PALETTE   : mm_decode_pal(s); return avpkt->size;
     case MM_TYPE_INTRA     : res = mm_decode_intra(s, 0, 0); break;
     case MM_TYPE_INTRA_HH  : res = mm_decode_intra(s, 1, 0); break;
diff --git a/libavformat/mm.c b/libavformat/mm.c
index a40b5c44bb..8d79311a07 100644
--- a/libavformat/mm.c
+++ b/libavformat/mm.c
@@ -40,17 +40,20 @@
 #define MM_PREAMBLE_SIZE    6
 
 #define MM_TYPE_HEADER      0x0
+#define MM_TYPE_RAW         0x2
 #define MM_TYPE_INTER       0x5
 #define MM_TYPE_INTRA       0x8
 #define MM_TYPE_INTRA_HH    0xc
 #define MM_TYPE_INTER_HH    0xd
 #define MM_TYPE_INTRA_HHV   0xe
 #define MM_TYPE_INTER_HHV   0xf
+#define MM_TYPE_AUDIO2      0x14
 #define MM_TYPE_AUDIO       0x15
 #define MM_TYPE_PALETTE     0x31
 
 #define MM_HEADER_LEN_V     0x16    /* video only */
 #define MM_HEADER_LEN_AV    0x18    /* video + audio */
+#define MM_HEADER_LEN_AV2   0x1a
 
 #define MM_PALETTE_COUNT    128
 #define MM_PALETTE_SIZE     (MM_PALETTE_COUNT*3)
@@ -68,7 +71,7 @@ static int probe(const AVProbeData *p)
     if (AV_RL16(&p->buf[0]) != MM_TYPE_HEADER)
         return 0;
     len = AV_RL32(&p->buf[2]);
-    if (len != MM_HEADER_LEN_V && len != MM_HEADER_LEN_AV)
+    if (len != MM_HEADER_LEN_V && len != MM_HEADER_LEN_AV && len != MM_HEADER_LEN_AV2)
         return 0;
     fps = AV_RL16(&p->buf[8]);
     w = AV_RL16(&p->buf[12]);
@@ -118,7 +121,7 @@ static int read_header(AVFormatContext *s)
     avpriv_set_pts_info(st, 64, 1, frame_rate);
 
     /* audio stream */
-    if (length == MM_HEADER_LEN_AV) {
+    if (length >= MM_HEADER_LEN_AV) {
         st = avformat_new_stream(s, NULL);
         if (!st)
             return AVERROR(ENOMEM);
@@ -154,6 +157,7 @@ static int read_packet(AVFormatContext *s,
         length = AV_RL16(&preamble[2]);
 
         switch(type) {
+        case MM_TYPE_RAW :
         case MM_TYPE_PALETTE :
         case MM_TYPE_INTER :
         case MM_TYPE_INTRA :
@@ -186,6 +190,7 @@ static int read_packet(AVFormatContext *s,
 
         default :
             av_log(s, AV_LOG_INFO, "unknown chunk type 0x%x\n", type);
+        case MM_TYPE_AUDIO2 :
             avio_skip(pb, length);
         }
     }
-- 
2.43.0

-- Peter
(A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 2/4] mm: decode partial palette

[Andreas Rheinhardt]

Peter Ross:
> ---
> palette decoding now conforms to description at https://wiki.multimedia.cx/index.php/IBM_PhotoMotion
> 
>  libavcodec/mmvideo.c | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/libavcodec/mmvideo.c b/libavcodec/mmvideo.c
> index 3038d9ea92..b5b6ffd25b 100644
> --- a/libavcodec/mmvideo.c
> +++ b/libavcodec/mmvideo.c
> @@ -79,12 +79,10 @@ static av_cold int mm_decode_init(AVCodecContext *avctx)
>  static void mm_decode_pal(MmContext *s)
>  {
>      int i;
> -
> -    bytestream2_skip(&s->gb, 4);
> -    for (i = 0; i < 128; i++) {
> -        s->palette[i] = 0xFFU << 24 | bytestream2_get_be24(&s->gb);
> -        s->palette[i+128] = s->palette[i]<<2;
> -    }
> +    int start = bytestream2_get_le16(&s->gb);
> +    int count = bytestream2_get_le16(&s->gb);
> +    for (i = 0; i < count; i++)

You can use loop-scope for the iterator here and save a line.

> +        s->palette[start+i] = 0xFFU << 24 | (bytestream2_get_be24(&s->gb) << 2);
>  }
>  
>  /**

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".