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

Side by Side Diff: source/patched-ffmpeg-mt/libavdevice/alsa-audio.h

Issue 3384002: ffmpeg source update for sep 09 (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 10 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * ALSA input and output 2 * ALSA input and output
3 * Copyright (c) 2007 Luca Abeni ( lucabe72 email it ) 3 * Copyright (c) 2007 Luca Abeni ( lucabe72 email it )
4 * Copyright (c) 2007 Benoit Fouet ( benoit fouet free fr ) 4 * Copyright (c) 2007 Benoit Fouet ( benoit fouet free fr )
5 * 5 *
6 * This file is part of FFmpeg. 6 * This file is part of FFmpeg.
7 * 7 *
8 * FFmpeg is free software; you can redistribute it and/or 8 * FFmpeg is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Lesser General Public 9 * modify it under the terms of the GNU Lesser General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 19 matching lines...) Expand all
30 #ifndef AVDEVICE_ALSA_AUDIO_H 30 #ifndef AVDEVICE_ALSA_AUDIO_H
31 #define AVDEVICE_ALSA_AUDIO_H 31 #define AVDEVICE_ALSA_AUDIO_H
32 32
33 #include <alsa/asoundlib.h> 33 #include <alsa/asoundlib.h>
34 #include "config.h" 34 #include "config.h"
35 #include "libavformat/avformat.h" 35 #include "libavformat/avformat.h"
36 36
37 /* XXX: we make the assumption that the soundcard accepts this format */ 37 /* XXX: we make the assumption that the soundcard accepts this format */
38 /* XXX: find better solution with "preinit" method, needed also in 38 /* XXX: find better solution with "preinit" method, needed also in
39 other formats */ 39 other formats */
40 #if HAVE_BIGENDIAN 40 #define DEFAULT_CODEC_ID AV_NE(CODEC_ID_PCM_S16BE, CODEC_ID_PCM_S16LE)
41 #define DEFAULT_CODEC_ID CODEC_ID_PCM_S16BE
42 #else
43 #define DEFAULT_CODEC_ID CODEC_ID_PCM_S16LE
44 #endif
45 41
46 typedef struct { 42 typedef struct {
47 snd_pcm_t *h; 43 snd_pcm_t *h;
48 int frame_size; ///< preferred size for reads and writes 44 int frame_size; ///< preferred size for reads and writes
49 int period_size; ///< bytes per sample * channels 45 int period_size; ///< bytes per sample * channels
50 } AlsaData; 46 } AlsaData;
51 47
52 /** 48 /**
53 * Open an ALSA PCM. 49 * Open an ALSA PCM.
54 * 50 *
(...skipping 25 matching lines...) Expand all
80 * Try to recover from ALSA buffer underrun. 76 * Try to recover from ALSA buffer underrun.
81 * 77 *
82 * @param s1 media file handle 78 * @param s1 media file handle
83 * @param err error code reported by the previous ALSA call 79 * @param err error code reported by the previous ALSA call
84 * 80 *
85 * @return 0 if OK, AVERROR_xxx on error 81 * @return 0 if OK, AVERROR_xxx on error
86 */ 82 */
87 int ff_alsa_xrun_recover(AVFormatContext *s1, int err); 83 int ff_alsa_xrun_recover(AVFormatContext *s1, int err);
88 84
89 #endif /* AVDEVICE_ALSA_AUDIO_H */ 85 #endif /* AVDEVICE_ALSA_AUDIO_H */
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/libavcore/parseutils.h ('k') | source/patched-ffmpeg-mt/libavdevice/avdevice.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698