* Fixed bug where a new audio stream was created in the audio mixer for each frame...

diff --git a/core/frame/frame.cpp b/core/frame/frame.cpp
index f9b97f991f9122a5c3ada5d8bb0a3d3ad82a9d71..19a83d286e1671a9d4e4d8b9775debe3122e6a1c 100644 (file)
--- a/core/frame/frame.cpp
+++ b/core/frame/frame.cpp
@@ -93,7 +93,6 @@ core::mutable_audio_buffer& mutable_frame::audio_data(){return impl_->audio_data
 std::size_t mutable_frame::width() const{return impl_->desc_.planes.at(0).width;}
 std::size_t mutable_frame::height() const{return impl_->desc_.planes.at(0).height;}                                            
 const void* mutable_frame::stream_tag()const{return impl_->tag_;}                              
-const void* mutable_frame::data_tag()const{return impl_.get();}        
 const frame_geometry& mutable_frame::geometry() const { return impl_->geometry_; }
 void mutable_frame::set_geometry(const frame_geometry& g) { impl_->geometry_ = g; }
 caspar::timer mutable_frame::since_created() const { return impl_->since_created_timer_; }
@@ -236,7 +235,6 @@ std::size_t const_frame::width()const{return impl_->width();}
 std::size_t const_frame::height()const{return impl_->height();}        
 std::size_t const_frame::size()const{return impl_->size();}                                            
 const void* const_frame::stream_tag()const{return impl_->tag_;}                                
-const void* const_frame::data_tag()const{return impl_.get();}  
 const frame_geometry& const_frame::geometry() const { return impl_->geometry_; }
 void const_frame::set_geometry(const frame_geometry& g) { impl_->geometry_ = g; }
 int64_t const_frame::get_age_millis() const { return impl_->get_age_millis(); }

diff --git a/core/frame/frame.h b/core/frame/frame.h
index f2a93bfd12db9223260541bfa850dbc2b427652b..6ae3d0a044c6490af1d3f7a035b6bee9a6ee8a2f 100644 (file)
--- a/core/frame/frame.h
+++ b/core/frame/frame.h
@@ -62,7 +62,6 @@ public:
        std::size_t height() const;
                                                                
        const void* stream_tag() const;
-       const void* data_tag() const;
 
        const core::frame_geometry& geometry() const;
        void set_geometry(const frame_geometry& g);
@@ -113,7 +112,6 @@ public:
        std::size_t size() const;
                                                                
        const void* stream_tag() const;
-       const void* data_tag() const;
 
        const core::frame_geometry& geometry() const;
        void set_geometry(const frame_geometry& g);

diff --git a/modules/ffmpeg/producer/muxer/frame_muxer.cpp b/modules/ffmpeg/producer/muxer/frame_muxer.cpp
index d47fe9d4a910d9d236ba0c8efeebe7b33595e602..7cb40f809ca76da73c952dac9422906b9833b464 100644 (file)
--- a/modules/ffmpeg/producer/muxer/frame_muxer.cpp
+++ b/modules/ffmpeg/producer/muxer/frame_muxer.cpp
@@ -241,7 +241,7 @@ struct frame_muxer::impl : boost::noncopyable
                                        auto second_audio_frame = core::mutable_frame(
                                                        std::vector<array<std::uint8_t>>(),
                                                        pop_audio(),
-                                                       frame1.data_tag(),
+                                                       frame1.stream_tag(),
                                                        core::pixel_format_desc(),
                                                        channel_layout_);
                                        auto first_frame = core::draw_frame(std::move(frame1));