Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
c11fc174
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
4
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_jdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
c11fc174
编写于
3月 03, 2011
作者:
A
amenkov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
6801206: SoundTestSuite: test050 fails
Reviewed-by: stayer
上级
4a351471
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
122 addition
and
73 deletion
+122
-73
src/share/classes/com/sun/media/sound/DirectAudioDevice.java
src/share/classes/com/sun/media/sound/DirectAudioDevice.java
+32
-73
test/javax/sound/sampled/Clip/ClipSetPos.java
test/javax/sound/sampled/Clip/ClipSetPos.java
+90
-0
未找到文件。
src/share/classes/com/sun/media/sound/DirectAudioDevice.java
浏览文件 @
c11fc174
...
@@ -395,11 +395,7 @@ class DirectAudioDevice extends AbstractMixer {
...
@@ -395,11 +395,7 @@ class DirectAudioDevice extends AbstractMixer {
protected
volatile
boolean
noService
=
false
;
// do not run the nService method
protected
volatile
boolean
noService
=
false
;
// do not run the nService method
// Guards all native calls.
// Guards all native calls.
protected
Object
lockNative
=
new
Object
();
protected
final
Object
lockNative
=
new
Object
();
// Guards the lastOpened static variable in implOpen and implClose.
protected
static
Object
lockLast
=
new
Object
();
// Keeps track of last opened line, see implOpen "trick".
protected
static
DirectDL
lastOpened
;
// CONSTRUCTOR
// CONSTRUCTOR
protected
DirectDL
(
DataLine
.
Info
info
,
protected
DirectDL
(
DataLine
.
Info
info
,
...
@@ -501,48 +497,21 @@ class DirectAudioDevice extends AbstractMixer {
...
@@ -501,48 +497,21 @@ class DirectAudioDevice extends AbstractMixer {
// align buffer to full frames
// align buffer to full frames
bufferSize
=
((
int
)
bufferSize
/
format
.
getFrameSize
())
*
format
.
getFrameSize
();
bufferSize
=
((
int
)
bufferSize
/
format
.
getFrameSize
())
*
format
.
getFrameSize
();
synchronized
(
lockLast
)
{
id
=
nOpen
(
mixerIndex
,
deviceID
,
isSource
,
id
=
nOpen
(
mixerIndex
,
deviceID
,
isSource
,
encoding
,
encoding
,
hardwareFormat
.
getSampleRate
(),
hardwareFormat
.
getSampleRate
(),
hardwareFormat
.
getSampleSizeInBits
(),
hardwareFormat
.
getSampleSizeInBits
(),
hardwareFormat
.
getFrameSize
(),
hardwareFormat
.
getFrameSize
(),
hardwareFormat
.
getChannels
(),
hardwareFormat
.
getChannels
(),
hardwareFormat
.
getEncoding
().
equals
(
hardwareFormat
.
getEncoding
().
equals
(
AudioFormat
.
Encoding
.
PCM_SIGNED
),
AudioFormat
.
Encoding
.
PCM_SIGNED
),
hardwareFormat
.
isBigEndian
(),
hardwareFormat
.
isBigEndian
(),
bufferSize
);
bufferSize
);
if
(
id
==
0
)
{
// Bah... Dirty trick. The most likely cause is an application
// already having a line open for this particular hardware
// format and forgetting about it. If so, silently close that
// implementation and try again. Unfortuantely we can only
// open one line per hardware format currently.
if
(
lastOpened
!=
null
&&
hardwareFormat
.
matches
(
lastOpened
.
hardwareFormat
))
{
lastOpened
.
implClose
();
lastOpened
=
null
;
id
=
nOpen
(
mixerIndex
,
deviceID
,
isSource
,
encoding
,
hardwareFormat
.
getSampleRate
(),
hardwareFormat
.
getSampleSizeInBits
(),
hardwareFormat
.
getFrameSize
(),
hardwareFormat
.
getChannels
(),
hardwareFormat
.
getEncoding
().
equals
(
AudioFormat
.
Encoding
.
PCM_SIGNED
),
hardwareFormat
.
isBigEndian
(),
bufferSize
);
}
if
(
id
==
0
)
{
if
(
id
==
0
)
{
// TODO: nicer error messages...
// TODO: nicer error messages...
throw
new
LineUnavailableException
(
throw
new
LineUnavailableException
(
"line with format "
+
format
+
" not supported."
);
"line with format "
+
format
+
" not supported."
);
}
}
lastOpened
=
this
;
}
}
this
.
bufferSize
=
nGetBufferSize
(
id
,
isSource
);
this
.
bufferSize
=
nGetBufferSize
(
id
,
isSource
);
...
@@ -615,14 +584,13 @@ class DirectAudioDevice extends AbstractMixer {
...
@@ -615,14 +584,13 @@ class DirectAudioDevice extends AbstractMixer {
}
}
synchronized
(
lockNative
)
{
synchronized
(
lockNative
)
{
nStop
(
id
,
isSource
);
nStop
(
id
,
isSource
);
}
// wake up any waiting threads
synchronized
(
lock
)
{
// need to set doIO to false before notifying the
// need to set doIO to false before notifying the
// read/write thread, that's why isStartedRunning()
// read/write thread, that's why isStartedRunning()
// cannot be used
// cannot be used
doIO
=
false
;
doIO
=
false
;
}
// wake up any waiting threads
synchronized
(
lock
)
{
lock
.
notifyAll
();
lock
.
notifyAll
();
}
}
setActive
(
false
);
setActive
(
false
);
...
@@ -649,12 +617,8 @@ class DirectAudioDevice extends AbstractMixer {
...
@@ -649,12 +617,8 @@ class DirectAudioDevice extends AbstractMixer {
doIO
=
false
;
doIO
=
false
;
long
oldID
=
id
;
long
oldID
=
id
;
id
=
0
;
id
=
0
;
synchronized
(
lockLast
)
{
synchronized
(
lockNative
)
{
synchronized
(
lockNative
)
{
nClose
(
oldID
,
isSource
);
nClose
(
oldID
,
isSource
);
if
(
lastOpened
==
this
)
lastOpened
=
null
;
}
}
}
bytePosition
=
0
;
bytePosition
=
0
;
softwareConversionSize
=
0
;
softwareConversionSize
=
0
;
...
@@ -667,10 +631,9 @@ class DirectAudioDevice extends AbstractMixer {
...
@@ -667,10 +631,9 @@ class DirectAudioDevice extends AbstractMixer {
if
(
id
==
0
)
{
if
(
id
==
0
)
{
return
0
;
return
0
;
}
}
int
a
=
0
;
int
a
;
synchronized
(
lockNative
)
{
synchronized
(
lockNative
)
{
if
(
doIO
)
a
=
nAvailable
(
id
,
isSource
);
a
=
nAvailable
(
id
,
isSource
);
}
}
return
a
;
return
a
;
}
}
...
@@ -726,7 +689,7 @@ class DirectAudioDevice extends AbstractMixer {
...
@@ -726,7 +689,7 @@ class DirectAudioDevice extends AbstractMixer {
lock
.
notifyAll
();
lock
.
notifyAll
();
}
}
synchronized
(
lockNative
)
{
synchronized
(
lockNative
)
{
if
(
id
!=
0
&&
doIO
)
{
if
(
id
!=
0
)
{
// then flush native buffers
// then flush native buffers
nFlush
(
id
,
isSource
);
nFlush
(
id
,
isSource
);
}
}
...
@@ -737,10 +700,9 @@ class DirectAudioDevice extends AbstractMixer {
...
@@ -737,10 +700,9 @@ class DirectAudioDevice extends AbstractMixer {
// replacement for getFramePosition (see AbstractDataLine)
// replacement for getFramePosition (see AbstractDataLine)
public
long
getLongFramePosition
()
{
public
long
getLongFramePosition
()
{
long
pos
=
0
;
long
pos
;
synchronized
(
lockNative
)
{
synchronized
(
lockNative
)
{
if
(
doIO
)
pos
=
nGetBytePosition
(
id
,
isSource
,
bytePosition
);
pos
=
nGetBytePosition
(
id
,
isSource
,
bytePosition
);
}
}
// hack because ALSA sometimes reports wrong framepos
// hack because ALSA sometimes reports wrong framepos
if
(
pos
<
0
)
{
if
(
pos
<
0
)
{
...
@@ -786,12 +748,11 @@ class DirectAudioDevice extends AbstractMixer {
...
@@ -786,12 +748,11 @@ class DirectAudioDevice extends AbstractMixer {
}
}
int
written
=
0
;
int
written
=
0
;
while
(!
flushing
)
{
while
(!
flushing
)
{
int
thisWritten
=
0
;
int
thisWritten
;
synchronized
(
lockNative
)
{
synchronized
(
lockNative
)
{
if
(
doIO
)
thisWritten
=
nWrite
(
id
,
b
,
off
,
len
,
thisWritten
=
nWrite
(
id
,
b
,
off
,
len
,
softwareConversionSize
,
softwareConversionSize
,
leftGain
,
rightGain
);
leftGain
,
rightGain
);
if
(
thisWritten
<
0
)
{
if
(
thisWritten
<
0
)
{
// error in native layer
// error in native layer
break
;
break
;
...
@@ -1014,10 +975,9 @@ class DirectAudioDevice extends AbstractMixer {
...
@@ -1014,10 +975,9 @@ class DirectAudioDevice extends AbstractMixer {
}
}
int
read
=
0
;
int
read
=
0
;
while
(
doIO
&&
!
flushing
)
{
while
(
doIO
&&
!
flushing
)
{
int
thisRead
=
0
;
int
thisRead
;
synchronized
(
lockNative
)
{
synchronized
(
lockNative
)
{
if
(
doIO
)
thisRead
=
nRead
(
id
,
b
,
off
,
len
,
softwareConversionSize
);
thisRead
=
nRead
(
id
,
b
,
off
,
len
,
softwareConversionSize
);
if
(
thisRead
<
0
)
{
if
(
thisRead
<
0
)
{
// error in native layer
// error in native layer
break
;
break
;
...
@@ -1252,8 +1212,7 @@ class DirectAudioDevice extends AbstractMixer {
...
@@ -1252,8 +1212,7 @@ class DirectAudioDevice extends AbstractMixer {
// set new native position (if necessary)
// set new native position (if necessary)
// this must come after the flush!
// this must come after the flush!
synchronized
(
lockNative
)
{
synchronized
(
lockNative
)
{
if
(
doIO
)
nSetBytePosition
(
id
,
isSource
,
frames
*
frameSize
);
nSetBytePosition
(
id
,
isSource
,
frames
*
frameSize
);
}
}
if
(
Printer
.
debug
)
Printer
.
debug
(
" DirectClip.setFramePosition: "
if
(
Printer
.
debug
)
Printer
.
debug
(
" DirectClip.setFramePosition: "
...
...
test/javax/sound/sampled/Clip/ClipSetPos.java
0 → 100644
浏览文件 @
c11fc174
/*
* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/**
* @test
* @bug 6801206
* @summary Tests that Clip sets frame position
* @author Alex Menkov
*/
import
javax.sound.sampled.AudioFormat
;
import
javax.sound.sampled.AudioSystem
;
import
javax.sound.sampled.Clip
;
import
javax.sound.sampled.LineUnavailableException
;
public
class
ClipSetPos
{
final
static
AudioFormat
audioFormat
=
new
AudioFormat
(
44100
f
,
16
,
2
,
true
,
true
);
final
static
int
frameLength
=
44100
*
2
;
// 2 seconds
final
static
byte
[]
dataBuffer
=
new
byte
[
frameLength
*
(
audioFormat
.
getSampleSizeInBits
()/
8
)
*
audioFormat
.
getChannels
()];
final
static
int
MAX_FRAME_DELTA
=
20
;
public
static
void
main
(
String
[]
args
)
{
boolean
testPassed
=
true
;
Clip
clip
=
null
;
try
{
clip
=
AudioSystem
.
getClip
();
clip
.
open
(
audioFormat
,
dataBuffer
,
0
,
dataBuffer
.
length
);
}
catch
(
LineUnavailableException
ex
)
{
log
(
ex
);
log
(
"Cannot test (this is not failure)"
);
return
;
}
log
(
"clip: "
+
clip
.
getClass
().
getName
());
int
len
=
clip
.
getFrameLength
();
for
(
int
pos
=
0
;
pos
<
len
;
pos
+=
(
len
/
100
))
{
clip
.
setFramePosition
(
pos
);
int
curPos
=
clip
.
getFramePosition
();
if
(
Math
.
abs
(
pos
-
curPos
)
>
MAX_FRAME_DELTA
)
{
log
(
"Tried to set pos to "
+
pos
+
", but got back "
+
curPos
);
testPassed
=
false
;
}
else
{
log
(
"Sucessfully set pos to "
+
pos
);
}
}
clip
.
close
();
if
(
testPassed
)
{
log
(
"Test PASSED."
);
}
else
{
log
(
"Test FAILED."
);
throw
new
RuntimeException
(
"Test FAILED (see log)"
);
}
}
static
void
log
(
String
s
)
{
System
.
out
.
println
(
s
);
}
static
void
log
(
Exception
ex
)
{
ex
.
printStackTrace
(
System
.
out
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录