avdevice/decklink: refactor ff_decklink_set_format function

This is done to enable input format autodetection in decklink_dec.

Karthick J committed 9 years ago

Commit aa7b0321 parent 0e7865c4 files · +35 −14Browse files

Unified · Split

4 files

libavdevice/decklink_common.cpp +24 −14
libavdevice/decklink_common.h +1 −0
libavdevice/decklink_dec.cpp +6 −0
libavdevice/decklink_enc.cpp +4 −0

     return false;
 }
-int ff_decklink_set_format(AVFormatContext *avctx,
+int ff_decklink_set_configs(AVFormatContext *avctx,
-                               int width, int height,
+                            decklink_direction_t direction) {
-                               int tb_num, int tb_den,
-                               enum AVFieldOrder field_order,
-                               decklink_direction_t direction, int num)
-{
     struct decklink_cctx *cctx = (struct decklink_cctx *)avctx->priv_data;
     struct decklink_ctx *ctx = (struct decklink_ctx *)cctx->ctx;
-    BMDDisplayModeSupport support;
-    IDeckLinkDisplayModeIterator *itermode;
-    IDeckLinkDisplayMode *mode;
-    int i = 1;
     HRESULT res;
-    av_log(avctx, AV_LOG_DEBUG, "Trying to find mode for frame size %dx%d, frame timing %d/%d, field order %d, direction %d, mode number %d, format code %s\n",
-        width, height, tb_num, tb_den, field_order, direction, num, (cctx->format_code) ? cctx->format_code : "(unset)");
     if (ctx->duplex_mode) {
         DECKLINK_BOOL duplex_supported = false;
             av_log(avctx, AV_LOG_WARNING, "Unable to set duplex mode, because it is not supported.\n");
         }
     }
     if (direction == DIRECTION_IN) {
         int ret;
         ret = decklink_select_input(avctx, bmdDeckLinkConfigAudioInputConnection);
         ret = decklink_select_input(avctx, bmdDeckLinkConfigVideoInputConnection);
         if (ret < 0)
             return ret;
+    }
+    return 0;
+}
+int ff_decklink_set_format(AVFormatContext *avctx,
+                               int width, int height,
+                               int tb_num, int tb_den,
+                               enum AVFieldOrder field_order,
+                               decklink_direction_t direction, int num)
+{
+    struct decklink_cctx *cctx = (struct decklink_cctx *)avctx->priv_data;
+    struct decklink_ctx *ctx = (struct decklink_ctx *)cctx->ctx;
+    BMDDisplayModeSupport support;
+    IDeckLinkDisplayModeIterator *itermode;
+    IDeckLinkDisplayMode *mode;
+    int i = 1;
+    HRESULT res;
+    av_log(avctx, AV_LOG_DEBUG, "Trying to find mode for frame size %dx%d, frame timing %d/%d, field order %d, direction %d, mode number %d, format code %s\n",
+        width, height, tb_num, tb_den, field_order, direction, num, (cctx->format_code) ? cctx->format_code : "(unset)");
+    if (direction == DIRECTION_IN) {
         res = ctx->dli->GetDisplayModeIterator (&itermode);
     } else {
         res = ctx->dlo->GetDisplayModeIterator (&itermode);

libavdevice/decklink_common.h+1−0

@@ -134,6 +134,7 @@ static const BMDVideoConnection decklink_video_connection_map[] = { · 133 unmodified lines
134	};	134	};
135		135
136	HRESULT ff_decklink_get_display_name(IDeckLink This, const char *displayName);	136	HRESULT ff_decklink_get_display_name(IDeckLink This, const char *displayName);
		137	int ff_decklink_set_configs(AVFormatContext *avctx, decklink_direction_t direction);
137	int ff_decklink_set_format(AVFormatContext *avctx, int width, int height, int tb_num, int tb_den, enum AVFieldOrder field_order, decklink_direction_t direction = DIRECTION_OUT, int num = 0);	138	int ff_decklink_set_format(AVFormatContext *avctx, int width, int height, int tb_num, int tb_den, enum AVFieldOrder field_order, decklink_direction_t direction = DIRECTION_OUT, int num = 0);
138	int ff_decklink_set_format(AVFormatContext *avctx, decklink_direction_t direction, int num);	139	int ff_decklink_set_format(AVFormatContext *avctx, decklink_direction_t direction, int num);
139	int ff_decklink_list_devices(AVFormatContext avctx, struct AVDeviceInfoList device_list, int show_inputs, int show_outputs);	140	int ff_decklink_list_devices(AVFormatContext avctx, struct AVDeviceInfoList device_list, int show_inputs, int show_outputs);

libavdevice/decklink_dec.cpp+6−0

         goto error;
     }
+    if (ff_decklink_set_configs(avctx, DIRECTION_IN) < 0) {
+        av_log(avctx, AV_LOG_ERROR, "Could not set input configuration\n");
+        ret = AVERROR(EIO);
+        goto error;
+    }
     if (mode_num > 0 || cctx->format_code) {
         if (ff_decklink_set_format(avctx, DIRECTION_IN, mode_num) < 0) {
             av_log(avctx, AV_LOG_ERROR, "Could not set mode number %d or format code %s for %s\n",

libavdevice/decklink_enc.cpp+4−0

         return -1;
     }
+    if (ff_decklink_set_configs(avctx, DIRECTION_OUT) < 0) {
+        av_log(avctx, AV_LOG_ERROR, "Could not set output configuration\n");
+        return -1;
+    }
     if (ff_decklink_set_format(avctx, c->width, c->height,
                             st->time_base.num, st->time_base.den, c->field_order)) {
         av_log(avctx, AV_LOG_ERROR, "Unsupported video size, framerate or field order!"

avdevice/decklink: refactor ff_decklink_set_format function

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code