Merge pull request #84 from rillian/moz-cheddar

Migrate to moz-cheddar 0.4.0.

Author: kinetiknz

mp4parse_capi/Cargo.toml

@@ -29,7 +29,7 @@ mp4parse = {version = "0.7.1", path = "../mp4parse"}
 num-traits = "0.1.37"
 
 [build-dependencies]
-rusty-cheddar = { git = "https://github.com/kinetiknz/rusty-cheddar" }
+moz-cheddar = "0.4.0"
 
 [features]
 fuzz = ["mp4parse/fuzz"]

mp4parse_capi/examples/afl-capi.rs

@@ -26,27 +26,27 @@ fn doit() {
     unsafe {
         let context = mp4parse_new(&io);
         let rv = mp4parse_read(context);
-        if rv == mp4parse_error::MP4PARSE_OK {
+        if rv == MP4PARSE::OK {
             let count = {
                 let mut count = 0;
                 let rv = mp4parse_get_track_count(context, &mut count);
-                assert_eq!(rv, mp4parse_error::MP4PARSE_OK);
+                assert_eq!(rv, MP4PARSE::OK);
                 count
             };
             for track in 0..count {
                 let mut info = mp4parse_track_info {
-                    track_type: mp4parse_track_type::MP4PARSE_TRACK_TYPE_VIDEO,
-                    codec: mp4parse_codec::MP4PARSE_CODEC_UNKNOWN,
+                    track_type: MP4PARSE_TRACK_TYPE::VIDEO,
+                    codec: MP4PARSE_CODEC::UNKNOWN,
                     track_id: 0,
                     duration: 0,
                     media_time: 0,
                 };
                 let rv = mp4parse_get_track_info(context, track, &mut info);
-                if rv == mp4parse_error::MP4PARSE_OK {
+                if rv == MP4PARSE::OK {
                     println!("track {}: id={} duration={} media_time={}",
                              track, info.track_id, info.duration, info.media_time);
                     match info.track_type {
-                        mp4parse_track_type::MP4PARSE_TRACK_TYPE_VIDEO => {
+                        MP4PARSE_TRACK_TYPE::VIDEO => {
                             let mut video = mp4parse_track_video_info {
                                 display_width: 0,
                                 display_height: 0,
@@ -57,16 +57,16 @@ fn doit() {
                                 protected_data: Default::default(),
                             };
                             let rv = mp4parse_get_track_video_info(context, track, &mut video);
-                            if rv == mp4parse_error::MP4PARSE_OK {
+                            if rv == MP4PARSE::OK {
                                 println!("  video: display={}x{} image={}x{}",
                                          video.display_width, video.display_height,
                                          video.image_width, video.image_height);
                             }
                         }
-                        mp4parse_track_type::MP4PARSE_TRACK_TYPE_AUDIO => {
+                        MP4PARSE_TRACK_TYPE::AUDIO => {
                             let mut audio = Default::default();
                             let rv = mp4parse_get_track_audio_info(context, track, &mut audio);
-                            if rv == mp4parse_error::MP4PARSE_OK {
+                            if rv == MP4PARSE::OK {
                                 println!("  audio: channels={} bit_depth={} sample_rate={}",
                                          audio.channels, audio.bit_depth, audio.sample_rate);
                             }

mp4parse_capi/examples/test.cc

@@ -115,7 +115,7 @@ void test_arg_validation_with_data(const std::string& filename)
   mp4parse_parser *parser = mp4parse_new(&io);
   assert(parser != nullptr);
 
-  mp4parse_error rv = mp4parse_read(parser);
+  MP4PARSE rv = mp4parse_read(parser);
   assert(rv == MP4PARSE_OK);
 
   uint32_t tracks;
@@ -166,7 +166,7 @@ void test_arg_validation_with_data(const std::string& filename)
   fclose(f);
 }
 
-const char * tracktype2str(mp4parse_track_type type)
+const char * tracktype2str(MP4PARSE_TRACK_TYPE type)
 {
   switch (type) {
     case MP4PARSE_TRACK_TYPE_VIDEO: return "video";
@@ -175,7 +175,7 @@ const char * tracktype2str(mp4parse_track_type type)
   return "unknown";
 }
 
-const char * errorstring(mp4parse_error error)
+const char * errorstring(MP4PARSE error)
 {
   switch (error) {
     case MP4PARSE_OK: return "Ok";
@@ -198,7 +198,7 @@ int32_t read_file(const char* filename)
   assert(parser != nullptr);
 
   fprintf(stderr, "Parsing file '%s'.\n", filename);
-  mp4parse_error rv = mp4parse_read(parser);
+  MP4PARSE rv = mp4parse_read(parser);
   if (rv != MP4PARSE_OK) {
     mp4parse_free(parser);
     fclose(f);