Move WebVtt Segmenter To Chunking Directory

Move the webvtt segmenter to the chunking directory so that it
can be converted to a general purpose text chunker.

Change-Id: I9ecd7ee39cb73070dab07b64f65ef24af1404813
This commit is contained in:
Aaron Vaage 2018-03-23 15:06:56 -07:00
parent 4e57259d2a
commit 2dd198a9d2
6 changed files with 9 additions and 9 deletions

View File

@ -19,6 +19,8 @@
'cue_alignment_handler.h',
'sync_point_queue.cc',
'sync_point_queue.h',
'webvtt_segmenter.cc',
'webvtt_segmenter.h',
],
'dependencies': [
'../base/media_base.gyp:media_base',
@ -30,6 +32,7 @@
'sources': [
'chunking_handler_unittest.cc',
'cue_alignment_handler_unittest.cc',
'webvtt_segmenter_unittest.cc',
],
'dependencies': [
'../../testing/gtest.gyp:gtest',

View File

@ -4,7 +4,7 @@
// license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd
#include "packager/media/formats/webvtt/webvtt_segmenter.h"
#include "packager/media/chunking/webvtt_segmenter.h"
namespace shaka {
namespace media {

View File

@ -4,8 +4,8 @@
// license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd
#ifndef PACKAGER_MEDIA_FORMATS_WEBVTT_WEBVTT_SEGMENTER_H_
#define PACKAGER_MEDIA_FORMATS_WEBVTT_WEBVTT_SEGMENTER_H_
#ifndef PACKAGER_MEDIA_CHUNKING_WEBVTT_SEGMENTER_H_
#define PACKAGER_MEDIA_CHUNKING_WEBVTT_SEGMENTER_H_
#include <stdint.h>
@ -50,4 +50,4 @@ class WebVttSegmenter : public MediaHandler {
} // namespace media
} // namespace shaka
#endif // PACKAGER_MEDIA_FORMATS_WEBVTT_WEBVTT_SEGMENTER_H_
#endif // PACKAGER_MEDIA_CHUNKING_WEBVTT_SEGMENTER_H_

View File

@ -8,7 +8,7 @@
#include <gtest/gtest.h>
#include "packager/media/base/media_handler_test_base.h"
#include "packager/media/formats/webvtt/webvtt_segmenter.h"
#include "packager/media/chunking/webvtt_segmenter.h"
#include "packager/status_test_util.h"
namespace shaka {

View File

@ -21,8 +21,6 @@
'webvtt_output_handler.h',
'webvtt_parser.cc',
'webvtt_parser.h',
'webvtt_segmenter.cc',
'webvtt_segmenter.h',
'webvtt_timestamp.cc',
'webvtt_timestamp.h',
'webvtt_to_mp4_handler.cc',
@ -42,7 +40,6 @@
'text_readers_unittest.cc',
'webvtt_output_handler_unittest.cc',
'webvtt_parser_unittest.cc',
'webvtt_segmenter_unittest.cc',
'webvtt_timestamp_unittest.cc',
'webvtt_to_mp4_handler_unittest.cc',
],

View File

@ -34,6 +34,7 @@
#include "packager/media/base/muxer_util.h"
#include "packager/media/chunking/chunking_handler.h"
#include "packager/media/chunking/cue_alignment_handler.h"
#include "packager/media/chunking/webvtt_segmenter.h"
#include "packager/media/crypto/encryption_handler.h"
#include "packager/media/demuxer/demuxer.h"
#include "packager/media/event/muxer_listener_factory.h"
@ -41,7 +42,6 @@
#include "packager/media/formats/webvtt/text_readers.h"
#include "packager/media/formats/webvtt/webvtt_output_handler.h"
#include "packager/media/formats/webvtt/webvtt_parser.h"
#include "packager/media/formats/webvtt/webvtt_segmenter.h"
#include "packager/media/formats/webvtt/webvtt_to_mp4_handler.h"
#include "packager/media/replicator/replicator.h"
#include "packager/media/trick_play/trick_play_handler.h"