diff mbox series

[FFmpeg-devel,v7,3/3] avdevice/decklink_dec: export timecode with s12m side data

Message ID 1594387379-22873-1-git-send-email-lance.lmwang@gmail.com
State Superseded
Headers show
Series Untitled series #1719
Related show

Commit Message

Limin Wang July 10, 2020, 1:22 p.m. UTC
From: Limin Wang <lance.lmwang@gmail.com>

Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
---
 libavdevice/decklink_dec.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

Comments

Marton Balint July 11, 2020, 5:13 p.m. UTC | #1
On Fri, 10 Jul 2020, lance.lmwang@gmail.com wrote:

> From: Limin Wang <lance.lmwang@gmail.com>
>
> Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
> ---
> libavdevice/decklink_dec.cpp | 16 ++++++++++++++++
> 1 file changed, 16 insertions(+)
>
> diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp
> index a499972..8adc00b 100644
> --- a/libavdevice/decklink_dec.cpp
> +++ b/libavdevice/decklink_dec.cpp
> @@ -42,6 +42,7 @@ extern "C" {
> #include "libavutil/imgutils.h"
> #include "libavutil/intreadwrite.h"
> #include "libavutil/time.h"
> +#include "libavutil/timecode.h"
> #include "libavutil/mathematics.h"
> #include "libavutil/reverse.h"
> #include "avdevice.h"
> @@ -882,6 +883,21 @@ HRESULT decklink_input_callback::VideoInputFrameArrived(
>                         AVDictionary* metadata_dict = NULL;
>                         int metadata_len;
>                         uint8_t* packed_metadata;
> +                        AVTimecode tcr;
> +
> +                        if (av_timecode_init_from_string(&tcr, ctx->video_st->r_frame_rate, tc, ctx) >= 0) {
> +                            uint32_t tc_data;
> +                            uint8_t *sd;
> +                            int size = sizeof(uint32_t) * 4;
> +
> +                            tc_data = av_timecode_get_smpte_from_framenum(&tcr, 0);
> +                            sd = av_packet_new_side_data(&pkt, AV_PKT_DATA_S12M_TIMECODE, size);

You can put these two into the same line as the declaration if you 
initialize size first.

> +                            if (sd) {
> +                                AV_WL32(sd, 1); // one TC ;
> +                                AV_WL32(sd + 4, tc_data); // TC;
> +                            }
> +                        }
> +

Regards,
Marton

>                         if (av_dict_set(&metadata_dict, "timecode", tc, AV_DICT_DONT_STRDUP_VAL) >= 0) {
>                             packed_metadata = av_packet_pack_dictionary(metadata_dict, &metadata_len);
>                             av_dict_free(&metadata_dict);
> -- 
> 1.8.3.1
>
> _______________________________________________
> 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".
Limin Wang July 11, 2020, 10:59 p.m. UTC | #2
On Sat, Jul 11, 2020 at 07:13:31PM +0200, Marton Balint wrote:
> 
> 
> On Fri, 10 Jul 2020, lance.lmwang@gmail.com wrote:
> 
> > From: Limin Wang <lance.lmwang@gmail.com>
> > 
> > Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
> > ---
> > libavdevice/decklink_dec.cpp | 16 ++++++++++++++++
> > 1 file changed, 16 insertions(+)
> > 
> > diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp
> > index a499972..8adc00b 100644
> > --- a/libavdevice/decklink_dec.cpp
> > +++ b/libavdevice/decklink_dec.cpp
> > @@ -42,6 +42,7 @@ extern "C" {
> > #include "libavutil/imgutils.h"
> > #include "libavutil/intreadwrite.h"
> > #include "libavutil/time.h"
> > +#include "libavutil/timecode.h"
> > #include "libavutil/mathematics.h"
> > #include "libavutil/reverse.h"
> > #include "avdevice.h"
> > @@ -882,6 +883,21 @@ HRESULT decklink_input_callback::VideoInputFrameArrived(
> >                         AVDictionary* metadata_dict = NULL;
> >                         int metadata_len;
> >                         uint8_t* packed_metadata;
> > +                        AVTimecode tcr;
> > +
> > +                        if (av_timecode_init_from_string(&tcr, ctx->video_st->r_frame_rate, tc, ctx) >= 0) {
> > +                            uint32_t tc_data;
> > +                            uint8_t *sd;
> > +                            int size = sizeof(uint32_t) * 4;
> > +
> > +                            tc_data = av_timecode_get_smpte_from_framenum(&tcr, 0);
> > +                            sd = av_packet_new_side_data(&pkt, AV_PKT_DATA_S12M_TIMECODE, size);
> 
> You can put these two into the same line as the declaration if you
> initialize size first.

Sure, have updated the patch, please check it, thanks.

> 
> > +                            if (sd) {
> > +                                AV_WL32(sd, 1); // one TC ;
> > +                                AV_WL32(sd + 4, tc_data); // TC;
> > +                            }
> > +                        }
> > +
> 
> Regards,
> Marton
> 
> >                         if (av_dict_set(&metadata_dict, "timecode", tc, AV_DICT_DONT_STRDUP_VAL) >= 0) {
> >                             packed_metadata = av_packet_pack_dictionary(metadata_dict, &metadata_len);
> >                             av_dict_free(&metadata_dict);
> > -- 
> > 1.8.3.1
> > 
> > _______________________________________________
> > 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 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".
diff mbox series

Patch

diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp
index a499972..8adc00b 100644
--- a/libavdevice/decklink_dec.cpp
+++ b/libavdevice/decklink_dec.cpp
@@ -42,6 +42,7 @@  extern "C" {
 #include "libavutil/imgutils.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/time.h"
+#include "libavutil/timecode.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/reverse.h"
 #include "avdevice.h"
@@ -882,6 +883,21 @@  HRESULT decklink_input_callback::VideoInputFrameArrived(
                         AVDictionary* metadata_dict = NULL;
                         int metadata_len;
                         uint8_t* packed_metadata;
+                        AVTimecode tcr;
+
+                        if (av_timecode_init_from_string(&tcr, ctx->video_st->r_frame_rate, tc, ctx) >= 0) {
+                            uint32_t tc_data;
+                            uint8_t *sd;
+                            int size = sizeof(uint32_t) * 4;
+
+                            tc_data = av_timecode_get_smpte_from_framenum(&tcr, 0);
+                            sd = av_packet_new_side_data(&pkt, AV_PKT_DATA_S12M_TIMECODE, size);
+                            if (sd) {
+                                AV_WL32(sd, 1); // one TC ;
+                                AV_WL32(sd + 4, tc_data); // TC;
+                            }
+                        }
+
                         if (av_dict_set(&metadata_dict, "timecode", tc, AV_DICT_DONT_STRDUP_VAL) >= 0) {
                             packed_metadata = av_packet_pack_dictionary(metadata_dict, &metadata_len);
                             av_dict_free(&metadata_dict);