*: format code with rustfmt and fix clippy suggestions
* Add avformat_close_input call to clean up AVFormantContext * Format code with rustfmt * Fix clippy lint double_parens * Fix clippy lint deref_addrof * Fix clippy lint identity_conversion * Fix clippy lint match_ref_pats * Fix clippy lint cast_lossless * Fix clippy lint cmp_null * Fix clippy lint clone_on_ref_ptr * Fix clippy lint map_clone * Fix clippy lint needless_borrow * Fix clippy lint needless_pass_by_value * Fix clippy lints for examples * Fix clippy lint unused_io_amount * Fix clippy lint new_without_default * Ignore inline_always clippy lint * Add vim temp files to .gitignore
This commit is contained in:
Tadas Barzdžius
@ -1,174 +1,180 @@
|
||||
use std::ffi::CString;
|
||||
use std::mem::size_of;
|
||||
use std::ops::{Deref, DerefMut};
|
||||
use std::ptr;
|
||||
use std::mem::size_of;
|
||||
use std::ffi::CString;
|
||||
|
||||
use libc;
|
||||
|
||||
use ffi::*;
|
||||
use ::{Error, StreamMut, ChapterMut, Rational, Dictionary, format};
|
||||
use super::common::Context;
|
||||
use super::destructor;
|
||||
use codec::traits;
|
||||
use ffi::*;
|
||||
use {format, ChapterMut, Dictionary, Error, Rational, StreamMut};
|
||||
|
||||
pub struct Output {
|
||||
ptr: *mut AVFormatContext,
|
||||
ctx: Context,
|
||||
ptr: *mut AVFormatContext,
|
||||
ctx: Context,
|
||||
}
|
||||
|
||||
unsafe impl Send for Output { }
|
||||
unsafe impl Send for Output {}
|
||||
|
||||
impl Output {
|
||||
pub unsafe fn wrap(ptr: *mut AVFormatContext) -> Self {
|
||||
Output { ptr: ptr, ctx: Context::wrap(ptr, destructor::Mode::Output) }
|
||||
}
|
||||
pub unsafe fn wrap(ptr: *mut AVFormatContext) -> Self {
|
||||
Output {
|
||||
ptr: ptr,
|
||||
ctx: Context::wrap(ptr, destructor::Mode::Output),
|
||||
}
|
||||
}
|
||||
|
||||
pub unsafe fn as_ptr(&self) -> *const AVFormatContext {
|
||||
self.ptr as *const _
|
||||
}
|
||||
pub unsafe fn as_ptr(&self) -> *const AVFormatContext {
|
||||
self.ptr as *const _
|
||||
}
|
||||
|
||||
pub unsafe fn as_mut_ptr(&mut self) -> *mut AVFormatContext {
|
||||
self.ptr
|
||||
}
|
||||
pub unsafe fn as_mut_ptr(&mut self) -> *mut AVFormatContext {
|
||||
self.ptr
|
||||
}
|
||||
}
|
||||
|
||||
impl Output {
|
||||
pub fn format(&self) -> format::Output {
|
||||
unsafe {
|
||||
format::Output::wrap((*self.as_ptr()).oformat)
|
||||
}
|
||||
}
|
||||
pub fn format(&self) -> format::Output {
|
||||
unsafe { format::Output::wrap((*self.as_ptr()).oformat) }
|
||||
}
|
||||
|
||||
pub fn write_header(&mut self) -> Result<(), Error> {
|
||||
unsafe {
|
||||
match avformat_write_header(self.as_mut_ptr(), ptr::null_mut()) {
|
||||
0 => Ok(()),
|
||||
e => Err(Error::from(e)),
|
||||
}
|
||||
}
|
||||
}
|
||||
pub fn write_header(&mut self) -> Result<(), Error> {
|
||||
unsafe {
|
||||
match avformat_write_header(self.as_mut_ptr(), ptr::null_mut()) {
|
||||
0 => Ok(()),
|
||||
e => Err(Error::from(e)),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn write_header_with(&mut self, options: Dictionary) -> Result<Dictionary, Error> {
|
||||
unsafe {
|
||||
let mut opts = options.disown();
|
||||
let res = avformat_write_header(self.as_mut_ptr(), &mut opts);
|
||||
pub fn write_header_with(&mut self, options: Dictionary) -> Result<Dictionary, Error> {
|
||||
unsafe {
|
||||
let mut opts = options.disown();
|
||||
let res = avformat_write_header(self.as_mut_ptr(), &mut opts);
|
||||
|
||||
match res {
|
||||
0 => Ok(Dictionary::own(opts)),
|
||||
e => Err(Error::from(e)),
|
||||
}
|
||||
}
|
||||
}
|
||||
match res {
|
||||
0 => Ok(Dictionary::own(opts)),
|
||||
e => Err(Error::from(e)),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn write_trailer(&mut self) -> Result<(), Error> {
|
||||
unsafe {
|
||||
match av_write_trailer(self.as_mut_ptr()) {
|
||||
0 => Ok(()),
|
||||
e => Err(Error::from(e)),
|
||||
}
|
||||
}
|
||||
}
|
||||
pub fn write_trailer(&mut self) -> Result<(), Error> {
|
||||
unsafe {
|
||||
match av_write_trailer(self.as_mut_ptr()) {
|
||||
0 => Ok(()),
|
||||
e => Err(Error::from(e)),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn add_stream<E: traits::Encoder>(&mut self, codec: E) -> Result<StreamMut, Error> {
|
||||
unsafe {
|
||||
let codec = try!(codec.encoder().ok_or(Error::EncoderNotFound));
|
||||
let ptr = avformat_new_stream(self.as_mut_ptr(), codec.as_ptr());
|
||||
pub fn add_stream<E: traits::Encoder>(&mut self, codec: E) -> Result<StreamMut, Error> {
|
||||
unsafe {
|
||||
let codec = codec.encoder().ok_or(Error::EncoderNotFound)?;
|
||||
let ptr = avformat_new_stream(self.as_mut_ptr(), codec.as_ptr());
|
||||
|
||||
if ptr.is_null() {
|
||||
panic!("out of memory");
|
||||
}
|
||||
if ptr.is_null() {
|
||||
panic!("out of memory");
|
||||
}
|
||||
|
||||
let index = (*self.ctx.as_ptr()).nb_streams - 1;
|
||||
let index = (*self.ctx.as_ptr()).nb_streams - 1;
|
||||
|
||||
Ok(StreamMut::wrap(&mut self.ctx, index as usize))
|
||||
}
|
||||
}
|
||||
Ok(StreamMut::wrap(&mut self.ctx, index as usize))
|
||||
}
|
||||
}
|
||||
|
||||
pub fn add_chapter<R: Into<Rational>, S: AsRef<str>>(&mut self,
|
||||
id: i32,
|
||||
time_base: R,
|
||||
start: i64,
|
||||
end: i64,
|
||||
title: S) -> Result<ChapterMut, Error>
|
||||
{
|
||||
// avpriv_new_chapter is private (libavformat/internal.h)
|
||||
pub fn add_chapter<R: Into<Rational>, S: AsRef<str>>(
|
||||
&mut self,
|
||||
id: i32,
|
||||
time_base: R,
|
||||
start: i64,
|
||||
end: i64,
|
||||
title: S,
|
||||
) -> Result<ChapterMut, Error> {
|
||||
// avpriv_new_chapter is private (libavformat/internal.h)
|
||||
|
||||
if start > end {
|
||||
return Err(Error::InvalidData);
|
||||
}
|
||||
if start > end {
|
||||
return Err(Error::InvalidData);
|
||||
}
|
||||
|
||||
let mut existing = None;
|
||||
for chapter in self.chapters() {
|
||||
if chapter.id() == id {
|
||||
existing = Some(chapter.index());
|
||||
break;
|
||||
}
|
||||
}
|
||||
let mut existing = None;
|
||||
for chapter in self.chapters() {
|
||||
if chapter.id() == id {
|
||||
existing = Some(chapter.index());
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
let index = match existing {
|
||||
Some(index) => index,
|
||||
None => unsafe {
|
||||
let ptr = av_mallocz(size_of::<AVChapter>()).as_mut().ok_or(Error::Bug)?;
|
||||
let mut nb_chapters = (*self.as_ptr()).nb_chapters as i32;
|
||||
let index = match existing {
|
||||
Some(index) => index,
|
||||
None => unsafe {
|
||||
let ptr = av_mallocz(size_of::<AVChapter>())
|
||||
.as_mut()
|
||||
.ok_or(Error::Bug)?;
|
||||
let mut nb_chapters = (*self.as_ptr()).nb_chapters as i32;
|
||||
|
||||
// chapters array will be freed by `avformat_free_context`
|
||||
av_dynarray_add(
|
||||
&mut (*self.as_mut_ptr()).chapters as *mut _ as *mut libc::c_void,
|
||||
&mut nb_chapters,
|
||||
ptr
|
||||
);
|
||||
// chapters array will be freed by `avformat_free_context`
|
||||
av_dynarray_add(
|
||||
&mut (*self.as_mut_ptr()).chapters as *mut _ as *mut libc::c_void,
|
||||
&mut nb_chapters,
|
||||
ptr,
|
||||
);
|
||||
|
||||
if nb_chapters > 0 {
|
||||
(*self.as_mut_ptr()).nb_chapters = nb_chapters as u32;
|
||||
let index = (*self.ctx.as_ptr()).nb_chapters - 1;
|
||||
index as usize
|
||||
}
|
||||
else {
|
||||
// failed to add the chapter
|
||||
av_freep(ptr);
|
||||
return Err(Error::Bug);
|
||||
}
|
||||
},
|
||||
};
|
||||
if nb_chapters > 0 {
|
||||
(*self.as_mut_ptr()).nb_chapters = nb_chapters as u32;
|
||||
let index = (*self.ctx.as_ptr()).nb_chapters - 1;
|
||||
index as usize
|
||||
} else {
|
||||
// failed to add the chapter
|
||||
av_freep(ptr);
|
||||
return Err(Error::Bug);
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
let mut chapter = self.chapter_mut(index)
|
||||
.ok_or(Error::Bug)?;
|
||||
let mut chapter = self.chapter_mut(index).ok_or(Error::Bug)?;
|
||||
|
||||
chapter.set_id(id);
|
||||
chapter.set_time_base(time_base);
|
||||
chapter.set_start(start);
|
||||
chapter.set_end(end);
|
||||
chapter.set_metadata("title", title);
|
||||
chapter.set_id(id);
|
||||
chapter.set_time_base(time_base);
|
||||
chapter.set_start(start);
|
||||
chapter.set_end(end);
|
||||
chapter.set_metadata("title", title);
|
||||
|
||||
Ok(chapter)
|
||||
}
|
||||
Ok(chapter)
|
||||
}
|
||||
|
||||
pub fn set_metadata(&mut self, dictionary: Dictionary) {
|
||||
unsafe {
|
||||
(*self.as_mut_ptr()).metadata = dictionary.disown();
|
||||
}
|
||||
}
|
||||
pub fn set_metadata(&mut self, dictionary: Dictionary) {
|
||||
unsafe {
|
||||
(*self.as_mut_ptr()).metadata = dictionary.disown();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Deref for Output {
|
||||
type Target = Context;
|
||||
type Target = Context;
|
||||
|
||||
fn deref(&self) -> &Self::Target {
|
||||
&self.ctx
|
||||
}
|
||||
fn deref(&self) -> &Self::Target {
|
||||
&self.ctx
|
||||
}
|
||||
}
|
||||
|
||||
impl DerefMut for Output {
|
||||
fn deref_mut(&mut self) -> &mut Self::Target {
|
||||
&mut self.ctx
|
||||
}
|
||||
fn deref_mut(&mut self) -> &mut Self::Target {
|
||||
&mut self.ctx
|
||||
}
|
||||
}
|
||||
|
||||
pub fn dump(ctx: &Output, index: i32, url: Option<&str>) {
|
||||
let url = url.map(|u| CString::new(u).unwrap());
|
||||
let url = url.map(|u| CString::new(u).unwrap());
|
||||
|
||||
unsafe {
|
||||
av_dump_format(ctx.as_ptr() as *mut _, index,
|
||||
url.map(|u| u.as_ptr()).unwrap_or(ptr::null()), 1);
|
||||
}
|
||||
unsafe {
|
||||
av_dump_format(
|
||||
ctx.as_ptr() as *mut _,
|
||||
index,
|
||||
url.map(|u| u.as_ptr()).unwrap_or(ptr::null()),
|
||||
1,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user