Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename VodMpdNotifyMuxerListener to MpdNotifyMuxerListener 

Change-Id: Ia23e127cc840f8b332c76cbac8c610c255c78ce5
This commit is contained in:
KongQun Yang 2014-05-16 14:03:52 -07:00
parent e7fe62763d
commit f6a54c289f
6 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
media/event/media_event.gyp
View File

@ -19,13 +19,13 @@
'target_name': 'media_event', 'target_name': 'media_event',
'type': '<(component)', 'type': '<(component)',
'sources': [ 'sources': [
'mpd_notify_muxer_listener.cc',
'mpd_notify_muxer_listener.h',
'muxer_listener.h', 'muxer_listener.h',
'muxer_listener_internal.cc',
'muxer_listener_internal.h',
'vod_media_info_dump_muxer_listener.cc', 'vod_media_info_dump_muxer_listener.cc',
'vod_media_info_dump_muxer_listener.h', 'vod_media_info_dump_muxer_listener.h',
'vod_mpd_notify_muxer_listener.cc',
'vod_mpd_notify_muxer_listener.h',
'vod_muxer_listener_internal.cc',
'vod_muxer_listener_internal.h',
], ],
'dependencies': [ 'dependencies': [
'../../mpd/mpd.gyp:media_info_proto', '../../mpd/mpd.gyp:media_info_proto',

18
media/event/vod_mpd_notify_muxer_listener.cc → media/event/mpd_notify_muxer_listener.cc
View File

@ -4,21 +4,21 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#include "media/event/vod_mpd_notify_muxer_listener.h" #include "media/event/mpd_notify_muxer_listener.h"
#include <cmath> #include <cmath>
#include "base/logging.h" #include "base/logging.h"
#include "media/base/audio_stream_info.h" #include "media/base/audio_stream_info.h"
#include "media/base/video_stream_info.h" #include "media/base/video_stream_info.h"
#include "media/event/vod_muxer_listener_internal.h" #include "media/event/muxer_listener_internal.h"
#include "mpd/base/media_info.pb.h" #include "mpd/base/media_info.pb.h"
#include "mpd/base/mpd_notifier.h" #include "mpd/base/mpd_notifier.h"
namespace media { namespace media {
namespace event { namespace event {
VodMpdNotifyMuxerListener::VodMpdNotifyMuxerListener( MpdNotifyMuxerListener::MpdNotifyMuxerListener(
dash_packager::MpdNotifier* mpd_notifier) dash_packager::MpdNotifier* mpd_notifier)
: mpd_notifier_(mpd_notifier), : mpd_notifier_(mpd_notifier),
reference_time_scale_(0), reference_time_scale_(0),
@ -26,9 +26,9 @@ VodMpdNotifyMuxerListener::VodMpdNotifyMuxerListener(
DCHECK(mpd_notifier); DCHECK(mpd_notifier);
} }
VodMpdNotifyMuxerListener::~VodMpdNotifyMuxerListener() {} MpdNotifyMuxerListener::~MpdNotifyMuxerListener() {}
void VodMpdNotifyMuxerListener::OnMediaStart( void MpdNotifyMuxerListener::OnMediaStart(
const MuxerOptions& muxer_options, const MuxerOptions& muxer_options,
const std::vector<StreamInfo*>& stream_infos, const std::vector<StreamInfo*>& stream_infos,
uint32 time_scale, uint32 time_scale,
@ -38,7 +38,7 @@ void VodMpdNotifyMuxerListener::OnMediaStart(
container_type_ = container_type; container_type_ = container_type;
} }
void VodMpdNotifyMuxerListener::OnMediaEnd( void MpdNotifyMuxerListener::OnMediaEnd(
const std::vector<StreamInfo*>& stream_infos, const std::vector<StreamInfo*>& stream_infos,
bool has_init_range, bool has_init_range,
uint64 init_range_start, uint64 init_range_start,
@ -71,9 +71,9 @@ void VodMpdNotifyMuxerListener::OnMediaEnd(
mpd_notifier_->NotifyNewContainer(media_info, &id); mpd_notifier_->NotifyNewContainer(media_info, &id);
} }
void VodMpdNotifyMuxerListener::OnNewSegment(uint64 start_time, void MpdNotifyMuxerListener::OnNewSegment(uint64 start_time,
uint64 duration, uint64 duration,
uint64 segment_file_size) {} uint64 segment_file_size) {}
} // namespace event } // namespace event
} // namespace media } // namespace media

14
media/event/vod_mpd_notify_muxer_listener.h → media/event/mpd_notify_muxer_listener.h
View File

@ -6,8 +6,8 @@
// //
// Implementation of MuxerListener that deals with MpdNotifier. // Implementation of MuxerListener that deals with MpdNotifier.
#ifndef MEDIA_EVENT_VOD_MPD_NOTIFY_MUXER_LISTENER_H_ #ifndef MEDIA_EVENT_MPD_NOTIFY_MUXER_LISTENER_H_
#define MEDIA_EVENT_VOD_MPD_NOTIFY_MUXER_LISTENER_H_ #define MEDIA_EVENT_MPD_NOTIFY_MUXER_LISTENER_H_
#include <vector> #include <vector>
@ -22,12 +22,12 @@ class MpdNotifier;
namespace media { namespace media {
namespace event { namespace event {
class VodMpdNotifyMuxerListener : public MuxerListener { class MpdNotifyMuxerListener : public MuxerListener {
public: public:
// |mpd_notifier| must be initialized, i.e mpd_notifier->Init() must be // |mpd_notifier| must be initialized, i.e mpd_notifier->Init() must be
// called. // called.
VodMpdNotifyMuxerListener(dash_packager::MpdNotifier* mpd_notifier); MpdNotifyMuxerListener(dash_packager::MpdNotifier* mpd_notifier);
virtual ~VodMpdNotifyMuxerListener(); virtual ~MpdNotifyMuxerListener();
// MuxerListener implementation. // MuxerListener implementation.
virtual void OnMediaStart(const MuxerOptions& muxer_options, virtual void OnMediaStart(const MuxerOptions& muxer_options,
@ -56,10 +56,10 @@ class VodMpdNotifyMuxerListener : public MuxerListener {
uint32 reference_time_scale_; uint32 reference_time_scale_;
ContainerType container_type_; ContainerType container_type_;
DISALLOW_COPY_AND_ASSIGN(VodMpdNotifyMuxerListener); DISALLOW_COPY_AND_ASSIGN(MpdNotifyMuxerListener);
}; };
} // namespace event } // namespace event
} // namespace media } // namespace media
#endif // MEDIA_EVENT_VOD_MPD_NOTIFY_MUXER_LISTENER_H_ #endif // MEDIA_EVENT_MPD_NOTIFY_MUXER_LISTENER_H_

3
media/event/vod_muxer_listener_internal.cc → media/event/muxer_listener_internal.cc
View File

@ -4,7 +4,7 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#include "media/event/vod_muxer_listener_internal.h" #include "media/event/muxer_listener_internal.h"
#include <math.h> #include <math.h>
@ -13,7 +13,6 @@
#include "media/base/muxer_options.h" #include "media/base/muxer_options.h"
#include "media/base/video_stream_info.h" #include "media/base/video_stream_info.h"
#include "mpd/base/media_info.pb.h" #include "mpd/base/media_info.pb.h"
#include "mpd/base/mpd_notifier.h"
namespace media { namespace media {
namespace event { namespace event {

6
media/event/vod_muxer_listener_internal.h → media/event/muxer_listener_internal.h
View File

@ -4,8 +4,8 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#ifndef MEDIA_EVENT_VOD_MUXER_LISTENER_INTERNAL_H_ #ifndef MEDIA_EVENT_MUXER_LISTENER_INTERNAL_H_
#define MEDIA_EVENT_VOD_MUXER_LISTENER_INTERNAL_H_ #define MEDIA_EVENT_MUXER_LISTENER_INTERNAL_H_
#include <vector> #include <vector>
@ -43,4 +43,4 @@ bool GenerateMediaInfo(const MuxerOptions& muxer_options,
} // namespace internal } // namespace internal
} // namespace event } // namespace event
} // namespace media } // namespace media
#endif // MEDIA_EVENT_VOD_MUXER_LISTENER_INTERNAL_H_ #endif // MEDIA_EVENT_MUXER_LISTENER_INTERNAL_H_

2
media/event/vod_media_info_dump_muxer_listener.cc
View File

@ -9,7 +9,7 @@
#include "base/logging.h" #include "base/logging.h"
#include "media/base/muxer_options.h" #include "media/base/muxer_options.h"
#include "media/base/stream_info.h" #include "media/base/stream_info.h"
#include "media/event/vod_muxer_listener_internal.h" #include "media/event/muxer_listener_internal.h"
#include "media/file/file.h" #include "media/file/file.h"
#include "mpd/base/media_info.pb.h" #include "mpd/base/media_info.pb.h"
#include "third_party/protobuf/src/google/protobuf/text_format.h" #include "third_party/protobuf/src/google/protobuf/text_format.h"