[FFmpeg-devel,v2,2/2] fftools/ffmpeg: add exif orientation support per frame's metadata

Submitted by Jun Li on May 26, 2019, 4:15 a.m.

Details

Message ID 20190526041534.23469-2-junli1026@gmail.com
State New
Headers show

Commit Message

Jun Li May 26, 2019, 4:15 a.m.
Fix #6945
Rotate or/and flip frame according to frame's metadata orientation
---
 fftools/ffmpeg.c        |  3 ++-
 fftools/ffmpeg.h        |  3 ++-
 fftools/ffmpeg_filter.c | 35 ++++++++++++++++++++++++++---------
 3 files changed, 30 insertions(+), 11 deletions(-)

Patch hide | download patch | download mbox

diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index 01f04103cf..da4c19c782 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -2142,7 +2142,8 @@  static int ifilter_send_frame(InputFilter *ifilter, AVFrame *frame)
         break;
     case AVMEDIA_TYPE_VIDEO:
         need_reinit |= ifilter->width  != frame->width ||
-                       ifilter->height != frame->height;
+                       ifilter->height != frame->height ||
+                       ifilter->orientation != get_frame_orientation(frame);
         break;
     }
 
diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h
index eb1eaf6363..54532ef0eb 100644
--- a/fftools/ffmpeg.h
+++ b/fftools/ffmpeg.h
@@ -244,7 +244,7 @@  typedef struct InputFilter {
     // parameters configured for this input
     int format;
 
-    int width, height;
+    int width, height, orientation;
     AVRational sample_aspect_ratio;
 
     int sample_rate;
@@ -649,6 +649,7 @@  int init_complex_filtergraph(FilterGraph *fg);
 void sub2video_update(InputStream *ist, AVSubtitle *sub);
 
 int ifilter_parameters_from_frame(InputFilter *ifilter, const AVFrame *frame);
+int get_frame_orientation(const AVFrame* frame);
 
 int ffmpeg_parse_options(int argc, char **argv);
 
diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c
index 72838de1e2..41dcf89692 100644
--- a/fftools/ffmpeg_filter.c
+++ b/fftools/ffmpeg_filter.c
@@ -743,6 +743,18 @@  static int sub2video_prepare(InputStream *ist, InputFilter *ifilter)
     return 0;
 }
 
+int get_frame_orientation(const AVFrame *frame)
+{
+    AVDictionaryEntry *entry = NULL;
+    int orientation = 0;
+    
+    // read exif orientation data
+    entry = av_dict_get(frame->metadata, "Orientation", NULL, 0);
+    if (entry)
+        orientation = atoi(entry->value);
+    return orientation;
+}
+
 static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter,
                                         AVFilterInOut *in)
 {
@@ -808,20 +820,24 @@  static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter,
 
     if (ist->autorotate) {
         double theta = get_rotation(ist->st);
-
-        if (fabs(theta - 90) < 1.0) {
+        char filter_args[64];
+
+        if (fabs(theta) < 1.0) { // no rotation info in stream meta
+            if (ifilter->orientation < 0 || ifilter->orientation > 8) {
+                av_log(NULL, AV_LOG_ERROR, "Invalid frame orientation: %i\n", ifilter->orientation);
+            } else if (ifilter->orientation > 1) { // skip 0 (not set) and 1 (orientaion 'Normal') 
+                snprintf(filter_args, sizeof(filter_args), "orientation=%i", ifilter->orientation);
+                ret = insert_filter(&last_filter, &pad_idx, "transpose", filter_args);
+            }
+        } else if (fabs(theta - 90) < 1.0) {
             ret = insert_filter(&last_filter, &pad_idx, "transpose", "clock");
         } else if (fabs(theta - 180) < 1.0) {
-            ret = insert_filter(&last_filter, &pad_idx, "hflip", NULL);
-            if (ret < 0)
-                return ret;
-            ret = insert_filter(&last_filter, &pad_idx, "vflip", NULL);
+            ret = insert_filter(&last_filter, &pad_idx, "transpose", "orientation=3");
         } else if (fabs(theta - 270) < 1.0) {
             ret = insert_filter(&last_filter, &pad_idx, "transpose", "cclock");
         } else if (fabs(theta) > 1.0) {
-            char rotate_buf[64];
-            snprintf(rotate_buf, sizeof(rotate_buf), "%f*PI/180", theta);
-            ret = insert_filter(&last_filter, &pad_idx, "rotate", rotate_buf);
+            snprintf(filter_args, sizeof(filter_args), "%f*PI/180", theta);
+            ret = insert_filter(&last_filter, &pad_idx, "rotate", filter_args);
         }
         if (ret < 0)
             return ret;
@@ -1191,6 +1207,7 @@  int ifilter_parameters_from_frame(InputFilter *ifilter, const AVFrame *frame)
     ifilter->width               = frame->width;
     ifilter->height              = frame->height;
     ifilter->sample_aspect_ratio = frame->sample_aspect_ratio;
+    ifilter->orientation         = get_frame_orientation(frame);
 
     ifilter->sample_rate         = frame->sample_rate;
     ifilter->channels            = frame->channels;