Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
469eb24a
Commit
469eb24a
authored
Mar 20, 2011
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Mac: remove trailing spaces
parent
77a3fbe8
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
75 additions
and
75 deletions
+75
-75
modules/access/qtcapture.m
modules/access/qtcapture.m
+8
-8
modules/audio_output/auhal.c
modules/audio_output/auhal.c
+67
-67
No files found.
modules/access/qtcapture.m
View file @
469eb24a
...
@@ -111,7 +111,7 @@ vlc_module_end ()
...
@@ -111,7 +111,7 @@ vlc_module_end ()
imageBufferToRelease
=
currentImageBuffer
;
imageBufferToRelease
=
currentImageBuffer
;
currentImageBuffer
=
videoFrame
;
currentImageBuffer
=
videoFrame
;
currentPts
=
(
mtime_t
)(
1000000L
/
[
sampleBuffer
presentationTime
].
timeScale
*
[
sampleBuffer
presentationTime
].
timeValue
);
currentPts
=
(
mtime_t
)(
1000000L
/
[
sampleBuffer
presentationTime
].
timeScale
*
[
sampleBuffer
presentationTime
].
timeValue
);
/* Try to use hosttime of the sample if available, because iSight Pts seems broken */
/* Try to use hosttime of the sample if available, because iSight Pts seems broken */
NSNumber
*
hosttime
=
(
NSNumber
*
)[
sampleBuffer
attributeForKey
:
QTSampleBufferHostTimeAttribute
];
NSNumber
*
hosttime
=
(
NSNumber
*
)[
sampleBuffer
attributeForKey
:
QTSampleBufferHostTimeAttribute
];
if
(
hosttime
)
currentPts
=
(
mtime_t
)
AudioConvertHostTimeToNanos
([
hosttime
unsignedLongLongValue
])
/
1000
;
if
(
hosttime
)
currentPts
=
(
mtime_t
)
AudioConvertHostTimeToNanos
([
hosttime
unsignedLongLongValue
])
/
1000
;
...
@@ -200,7 +200,7 @@ static int Open( vlc_object_t *p_this )
...
@@ -200,7 +200,7 @@ static int Open( vlc_object_t *p_this )
/* Only when selected */
/* Only when selected */
if
(
*
p_demux
->
psz_access
==
'\0'
)
if
(
*
p_demux
->
psz_access
==
'\0'
)
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
NSAutoreleasePool
*
pool
=
[[
NSAutoreleasePool
alloc
]
init
];
NSAutoreleasePool
*
pool
=
[[
NSAutoreleasePool
alloc
]
init
];
/* Set up p_demux */
/* Set up p_demux */
...
@@ -209,13 +209,13 @@ static int Open( vlc_object_t *p_this )
...
@@ -209,13 +209,13 @@ static int Open( vlc_object_t *p_this )
p_demux
->
info
.
i_update
=
0
;
p_demux
->
info
.
i_update
=
0
;
p_demux
->
info
.
i_title
=
0
;
p_demux
->
info
.
i_title
=
0
;
p_demux
->
info
.
i_seekpoint
=
0
;
p_demux
->
info
.
i_seekpoint
=
0
;
p_demux
->
p_sys
=
p_sys
=
calloc
(
1
,
sizeof
(
demux_sys_t
)
);
p_demux
->
p_sys
=
p_sys
=
calloc
(
1
,
sizeof
(
demux_sys_t
)
);
if
(
!
p_sys
)
if
(
!
p_sys
)
return
VLC_ENOMEM
;
return
VLC_ENOMEM
;
memset
(
&
fmt
,
0
,
sizeof
(
es_format_t
)
);
memset
(
&
fmt
,
0
,
sizeof
(
es_format_t
)
);
QTCaptureDeviceInput
*
input
=
nil
;
QTCaptureDeviceInput
*
input
=
nil
;
NSError
*
o_returnedError
;
NSError
*
o_returnedError
;
...
@@ -226,7 +226,7 @@ static int Open( vlc_object_t *p_this )
...
@@ -226,7 +226,7 @@ static int Open( vlc_object_t *p_this )
_
(
"Your Mac does not seem to be equipped with a suitable input device. "
_
(
"Your Mac does not seem to be equipped with a suitable input device. "
"Please check your connectors and drivers."
)
);
"Please check your connectors and drivers."
)
);
msg_Err
(
p_demux
,
"Can't find any Video device"
);
msg_Err
(
p_demux
,
"Can't find any Video device"
);
goto
error
;
goto
error
;
}
}
...
@@ -291,7 +291,7 @@ static int Open( vlc_object_t *p_this )
...
@@ -291,7 +291,7 @@ static int Open( vlc_object_t *p_this )
NSLog
(
@"encoded_size %d %d"
,
(
int
)
encoded_size
.
width
,
(
int
)
encoded_size
.
height
);
NSLog
(
@"encoded_size %d %d"
,
(
int
)
encoded_size
.
width
,
(
int
)
encoded_size
.
height
);
NSLog
(
@"display_size %d %d"
,
(
int
)
display_size
.
width
,
(
int
)
display_size
.
height
);
NSLog
(
@"display_size %d %d"
,
(
int
)
display_size
.
width
,
(
int
)
display_size
.
height
);
NSLog
(
@"PAR size %d %d"
,
(
int
)
par_size
.
width
,
(
int
)
par_size
.
height
);
NSLog
(
@"PAR size %d %d"
,
(
int
)
par_size
.
width
,
(
int
)
par_size
.
height
);
[
p_sys
->
output
setPixelBufferAttributes
:
[
NSDictionary
dictionaryWithObjectsAndKeys
:
[
p_sys
->
output
setPixelBufferAttributes
:
[
NSDictionary
dictionaryWithObjectsAndKeys
:
[
NSNumber
numberWithInt
:
p_sys
->
height
],
kCVPixelBufferHeightKey
,
[
NSNumber
numberWithInt
:
p_sys
->
height
],
kCVPixelBufferHeightKey
,
[
NSNumber
numberWithInt
:
p_sys
->
width
],
kCVPixelBufferWidthKey
,
[
NSNumber
numberWithInt
:
p_sys
->
width
],
kCVPixelBufferWidthKey
,
...
...
modules/audio_output/auhal.c
View file @
469eb24a
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment