Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(102)

Side by Side Diff: source/libvpx/third_party/libwebm/mkvmuxer.hpp

Issue 1339513003: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The WebM project authors. All Rights Reserved. 1 // Copyright (c) 2012 The WebM project authors. All Rights Reserved.
2 // 2 //
3 // Use of this source code is governed by a BSD-style license 3 // Use of this source code is governed by a BSD-style license
4 // that can be found in the LICENSE file in the root of the source 4 // that can be found in the LICENSE file in the root of the source
5 // tree. An additional intellectual property rights grant can be found 5 // tree. An additional intellectual property rights grant can be found
6 // in the file PATENTS. All contributing project authors may 6 // in the file PATENTS. All contributing project authors may
7 // be found in the AUTHORS file in the root of the source tree. 7 // be found in the AUTHORS file in the root of the source tree.
8 8
9 #ifndef MKVMUXER_HPP 9 #ifndef MKVMUXER_HPP
10 #define MKVMUXER_HPP 10 #define MKVMUXER_HPP
(...skipping 510 matching lines...) Expand 10 before | Expand all | Expand 10 after
521 521
522 LIBWEBM_DISALLOW_COPY_AND_ASSIGN(AudioTrack); 522 LIBWEBM_DISALLOW_COPY_AND_ASSIGN(AudioTrack);
523 }; 523 };
524 524
525 /////////////////////////////////////////////////////////////// 525 ///////////////////////////////////////////////////////////////
526 // Tracks element 526 // Tracks element
527 class Tracks { 527 class Tracks {
528 public: 528 public:
529 // Audio and video type defined by the Matroska specs. 529 // Audio and video type defined by the Matroska specs.
530 enum { kVideo = 0x1, kAudio = 0x2 }; 530 enum { kVideo = 0x1, kAudio = 0x2 };
531 // Opus, Vorbis, VP8, and VP9 codec ids defined by the Matroska specs. 531
532 static const char kOpusCodecId[]; 532 static const char kOpusCodecId[];
533 static const char kVorbisCodecId[]; 533 static const char kVorbisCodecId[];
534 static const char kVp8CodecId[]; 534 static const char kVp8CodecId[];
535 static const char kVp9CodecId[]; 535 static const char kVp9CodecId[];
536 static const char kVp10CodecId[]; 536 static const char kVp10CodecId[];
537 537
538 Tracks(); 538 Tracks();
539 ~Tracks(); 539 ~Tracks();
540 540
541 // Adds a Track element to the Tracks object. |track| will be owned and 541 // Adds a Track element to the Tracks object. |track| will be owned and
(...skipping 941 matching lines...) Expand 10 before | Expand all | Expand 10 after
1483 IMkvWriter* writer_cluster_; 1483 IMkvWriter* writer_cluster_;
1484 IMkvWriter* writer_cues_; 1484 IMkvWriter* writer_cues_;
1485 IMkvWriter* writer_header_; 1485 IMkvWriter* writer_header_;
1486 1486
1487 LIBWEBM_DISALLOW_COPY_AND_ASSIGN(Segment); 1487 LIBWEBM_DISALLOW_COPY_AND_ASSIGN(Segment);
1488 }; 1488 };
1489 1489
1490 } // end namespace mkvmuxer 1490 } // end namespace mkvmuxer
1491 1491
1492 #endif // MKVMUXER_HPP 1492 #endif // MKVMUXER_HPP
OLDNEW
« no previous file with comments | « source/libvpx/third_party/libwebm/README.libvpx ('k') | source/libvpx/third_party/libwebm/mkvparser.hpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698