Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix #3

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion prenc/prenc/MovieWriter.h
Expand Up @@ -36,7 +36,7 @@
* @param outFileName output file name
* @return instance of MovieWriter, nil otherwise
*/
- (id)initWithOutFile:(NSString *)outFileName;
- (id)initWithOutFile:(NSString *)outFileName timescale:(CMTimeScale)ts;

/**
* Writes CMSampleBuffer with encoded data to QuickTime Movie file.
Expand Down
12 changes: 9 additions & 3 deletions prenc/prenc/MovieWriter.m
Expand Up @@ -28,6 +28,7 @@ @interface MovieWriter ()

@property (strong, nonatomic) AVAssetWriter *assetWriter;
@property (strong, nonatomic) AVAssetWriterInput *assetInput;
@property (assign, nonatomic) CMTimeScale timescale;

@end

Expand All @@ -36,17 +37,19 @@ @implementation MovieWriter

- (id)init
{
return [self initWithOutFile:@"output.mov"];
return [self initWithOutFile:@"output.mov" timescale:600];
}

- (id)initWithOutFile:(NSString *)outFileName
- (id)initWithOutFile:(NSString *)outFileName timescale:(CMTimeScale)ts
{
NSURL *url = nil;
NSError *error;

if ((self = [super init]) == nil)
return nil;


self.timescale = ts;

url = [[NSURL alloc] initFileURLWithPath:outFileName];
// remove if file already exists
if (![[NSFileManager defaultManager] removeItemAtPath:[url path] error:&error])
Expand All @@ -72,6 +75,9 @@ - (id)initWithOutFile:(NSString *)outFileName
return nil;
}

self.assetWriter.movieTimeScale = self.timescale;
self.assetInput.mediaTimeScale = self.timescale;

[self.assetWriter addInput:self.assetInput];

if (![self.assetWriter startWriting])
Expand Down
2 changes: 1 addition & 1 deletion prenc/prenc/prenc.m
Expand Up @@ -303,7 +303,7 @@ int main(int argc, char *argv[])

outFileName = argv[optind];

movieWriter = [[MovieWriter alloc] initWithOutFile:[NSString stringWithUTF8String:outFileName]];
movieWriter = [[MovieWriter alloc] initWithOutFile:[NSString stringWithUTF8String:outFileName] timescale:tsDen];
if (movieWriter == nil)
return EXIT_FAILURE;

Expand Down