diff mbox series

[FFmpeg-devel,4/4] avformat/mov: get heif image mirroring from imir box

Message ID 20240930212813.10903-1-jamrial@gmail.com
State New
Headers show
Series [FFmpeg-devel,1/2] avformat/mov: factorize getting the current item | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 fail Make failed
andriy/make_x86 fail Make failed

Commit Message

James Almer Sept. 30, 2024, 9:28 p.m. UTC 
Complements 76eb3e5ff3a35eff01dd71aca82efcda50c4441f.

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavformat/isom.h |  2 ++
 libavformat/mov.c  | 27 ++++++++++++++++++++++++---
 2 files changed, 26 insertions(+), 3 deletions(-)

Comments

Anton Khirnov Oct. 1, 2024, 10:56 a.m. UTC | #1 
Quoting James Almer (2024-09-30 23:28:13)
> Complements 76eb3e5ff3a35eff01dd71aca82efcda50c4441f.
> 
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>  libavformat/isom.h |  2 ++
>  libavformat/mov.c  | 27 ++++++++++++++++++++++++---
>  2 files changed, 26 insertions(+), 3 deletions(-)

Do we have samples for this? Would be nice to have a test.
James Almer Oct. 1, 2024, 12:28 p.m. UTC | #2 
On 10/1/2024 7:56 AM, Anton Khirnov wrote:
> Quoting James Almer (2024-09-30 23:28:13)
>> Complements 76eb3e5ff3a35eff01dd71aca82efcda50c4441f.
>>
>> Signed-off-by: James Almer <jamrial@gmail.com>
>> ---
>>   libavformat/isom.h |  2 ++
>>   libavformat/mov.c  | 27 ++++++++++++++++++++++++---
>>   2 files changed, 26 insertions(+), 3 deletions(-)
> 
> Do we have samples for this? Would be nice to have a test.

Yes, there's one in the heif_conformance with clap, irot and imir boxes.
Will write a test for it.
diff mbox series

Patch

diff --git a/libavformat/isom.h b/libavformat/isom.h
index bc208772f9..49a4753fad 100644
--- a/libavformat/isom.h
+++ b/libavformat/isom.h
@@ -284,6 +284,8 @@  typedef struct HEIFItem {
     int width;
     int height;
     int rotation;
+    int hflip;
+    int vflip;
     int type;
     int is_idat_relative;
     uint8_t *icc_profile;
diff --git a/libavformat/mov.c b/libavformat/mov.c
index fdf2238d47..43444477e7 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -8994,6 +8994,25 @@  static int mov_read_irot(MOVContext *c, AVIOContext *pb, MOVAtom atom)
     return 0;
 }
 
+static int mov_read_imir(MOVContext *c, AVIOContext *pb, MOVAtom atom)
+{
+    HEIFItem *item;
+    int axis;
+
+    axis = avio_r8(pb) & 0x1;
+
+    av_log(c->fc, AV_LOG_TRACE, "imir: item_id %d, axis %u\n",
+           c->cur_item_id, axis);
+
+    item = heif_cur_item(c);
+    if (item) {
+        item->hflip =  axis;
+        item->vflip = !axis;
+    }
+
+    return 0;
+}
+
 static int mov_read_iprp(MOVContext *c, AVIOContext *pb, MOVAtom atom)
 {
     typedef struct MOVAtoms {
@@ -9218,6 +9237,7 @@  static const MOVParseTableEntry mov_default_parse_table[] = {
 { MKTAG('p','i','t','m'), mov_read_pitm },
 { MKTAG('e','v','c','C'), mov_read_glbl },
 { MKTAG('i','d','a','t'), mov_read_idat },
+{ MKTAG('i','m','i','r'), mov_read_imir },
 { MKTAG('i','r','e','f'), mov_read_iref },
 { MKTAG('i','s','p','e'), mov_read_ispe },
 { MKTAG('i','r','o','t'), mov_read_irot },
@@ -9922,6 +9942,7 @@  static int set_display_matrix_from_item(AVPacketSideData **coded_side_data, int
      * av_display_rotation_set() expects its argument to be
      * oriented clockwise, so we need to negate it. */
     av_display_rotation_set(matrix, -item->rotation);
+    av_display_matrix_flip(matrix, item->hflip, item->vflip);
 
     return 0;
 }
@@ -9967,7 +9988,7 @@  static int read_image_grid(AVFormatContext *s, const HEIFGrid *grid,
             return ret;
     }
     /* rotation */
-    if (item->rotation) {
+    if (item->rotation || item->hflip || item->vflip) {
         int ret = set_display_matrix_from_item(&tile_grid->coded_side_data,
                                                &tile_grid->nb_coded_side_data, item);
         if (ret < 0)
@@ -10066,7 +10087,7 @@  static int read_image_iovl(AVFormatContext *s, const HEIFGrid *grid,
     tile_grid->coded_height = (flags & 1) ? avio_rb32(s->pb) : avio_rb16(s->pb);
 
     /* rotation */
-    if (item->rotation) {
+    if (item->rotation || item->hflip || item->vflip) {
         int ret = set_display_matrix_from_item(&tile_grid->coded_side_data,
                                                &tile_grid->nb_coded_side_data, item);
         if (ret < 0)
@@ -10283,7 +10304,7 @@  static int mov_read_header(AVFormatContext *s)
             if (item->item_id == mov->primary_item_id)
                 st->disposition |= AV_DISPOSITION_DEFAULT;
 
-            if (item->rotation) {
+            if (item->rotation || item->hflip || item->vflip) {
                 int ret = set_display_matrix_from_item(&st->codecpar->coded_side_data,
                                                        &st->codecpar->nb_coded_side_data, item);
                 if (ret < 0)